Moved tests to the right directory
Fixed Travis build