Add stuff for travis-ci tests