refactor tests so they work with dev fixtures and on production