r19358: Use subunit tests from the right location (from