Fix tests for oneRequestPerClass feature

Change-Id: Ia9e18bc19128a890f25233d063983ba6ae4d9f03