Refactor Fixture tests