step 2.0 - fixtures refactor