CDITCK-433 split up the test