Updated test suites for travis compatibility