Updated tests to pass travisCI