Added another very random integration test and refactoring integration test suite a bit