Minor fixes to tests, tests still failing because of lack of models/controllers