LPS-33053 Add more tests to Recycle Bin AND Fix the bugs found