Refactored tests
Added travis script