Created remove method, update tests