Added consistency test for Remove
Fix testRemove and added testRemoveOnOwner
Fix remove consistency