ConditionTester renamed and moved to service layer