OK: 0393b6d292503b6ebb111f1c08b080766aa116ae Improve CVS detection so we can simplify test logic.
OK: 3f1fbb265b9730dd009f78f0c878bc7bcd84322b Simplify the test framework
