CDB-4232 Fix a couple of tests