Merge _remove and remove tests and remove _setEl tests