updated travis settings; rearranged tests;