Test fixes in cdrc