MAJOR FIX:  added another test to edge case and fixed the simple remove