Large scale clean up of testing suite to make it run on Travis