updated mapping sort priorities to avoid clashes between remove and other schemas
added more Remove tests