Test fixes
Travis file