Added Travis-CI and cleaned up some tests