CDB-4407 #908 more testing cleanup