[WIP] Fixes

I want to see how travis reacts to the tests.