cleanup mark 7, now cleans up CBORTest
fix test cases that regressed due to cleanup