Merge "block: test-iosched infrastructure enhancement"