LPS-44809 Use new mock implementation on tests