LPS-38308 Apply base test class changes