step 2.7 - fixtures refactor