Move fixtures to each step def file; split out features