improved remove test