fixed the remove test functions