step 3.2 - fixtures refactor