#128 Repaired tests to pass travis ci