Tests: Change fixtures; now passing all tests.
Merge pull request #525 from am11/master

Tests: Change fixtures; now passing all tests