security-server-tests-client-smack refactoring.