POPS-277 reverted test code