Some of CDIConstants moved into IDELabel + corresponding modification to

tests.