Revert "Fix security-server server tests"