Merge "L3 Agent Scheduler testcase cleanups"