Revert "Changed travis"

This reverts commit 12cabbfed84ce802d92020ea3da5a86e199f6300.
Tests renamed
Removed test shell script
Moved tests
Updated travis.yml