Phalanx service tests fixes