step 3.0 - fixtures refactor