fixed remove and added remove test