Merge "Make test tool work with schemas with no revision"