Fixed test fixtures and request controller tests
Merge branch 'fix-test-fixtures'