Fix fixtures and tests.
Merge pull request #191 from aplanas/master

Fix fixtures and tests.