Integration tests tidied