This allows us to delete most of our custom test logic, and avoids a recursive make for minor speed up.