Try to get Travis-CI to pick up the test suite files.
WIP on tests. Some minor cleanup.