Add and fix a number of tests
Fix fixtures and hopefully travis-ci