route testing
controller and integration testing
fixed conflicts from pull
fixtures and integration test
fixed conflicts from pull