update test fixtures names to work with spec and our tests, 17 spec tests passing