Make remove work; refactored tests