XGENTOOLS-438 testing