CDITCK-406 - reflect changes in tests for CDI-392