Develop

All tests pass under 2.4.5. Only thing that I believe is questionable is the endTest function of UserControllerTests line 594.