PHOENIX-1469 Rework tests