change remove interface and add more tests for remove method