TODO: Remove once migration from ServiceTest_Legacy to ServiceTest is complete