Fix test runner and fixtures.
Merge pull request #8 from treshugart/master

Merge from master to fix tests.