Update Remove function
Add Remove test on main function