cleanup travis and move tests