Minor refactoring in UsernameActivationStrategyTest
Don't use deprecated APIs in the test so much any more