MANTA-19 add additinal tests and debug info to track down cleaning bug