Renamed to TestQueryEvaluator and TestParent