Fixing tests

Wait for travis build to pass then ->  merge