Remove controller specs, update spec_helper to improve test speed and update Factories slightly