LPS-28160 Add tests for more recyle bin scenarios (and fix bugs found with it)