Cleaned up the way we define Done conditions for our integration tests