More passing tests
Fixtures and more fixing