D-12341 cleaning up tests