Corrected all tests except loginTest to use newly factored Shiro modules