WIP 7 tests still failing