GDS-1178 Cleanup tests