Update unit tests for travis-ci