More specs and tidying up the require statements

Noted a design issue with the UserPresenter and User classes.