[cleanup] cleaning up tests #OSNG-191