refactored tests to pass travis