Added users controllers and tidied up the other integration tests.