Re-added tests, problem with travis ci seems resolved