rewrote tests, fixed travis build