Re-structure tests, hopefully shutting-up Travis