Tests: Change fixtures; now passing all tests