step 2.8 - fixtures refactor