VID-1880 cleaning up tests