Fix some unit tests for travis