Small changes, tried out tests, will leave them for now after heaps of trouble trying to mock an authenticated user.