Fixing aspects of the cdmsHandler
Consequential test improvements