Fixtures fixed with more tests