Test cleanup and Adding Travis Support