Fixing our last attempt at making integration tests fail when uncommitted changes would be clobbered