Unittests

Fix the unittest problems we had in Travis CI so far (hopefully).