372 - cleanup tests