WIP fixture tests passing