Move all fixtures to test fixtures and remove duplicates
Fix integration test
Consolidate all 'set year from :year param' code into one place