Added more tests! Travis CI is REALLY COOL