fixed some controller and integration test issues