Code Cleanup
Added travis configuration.
Adapted tests