Remove the duplicate code in tests
* This could be the cause of the UserAuth JUnit tests taking longer than expected.
Merge pull request #77 from mikeyman77/logic/fixes

Remove the duplicate code in tests