Completed initial tests, updated setup, updated travis.