tidied up integration tests