[HHH-7963]
cleanups + more testing