update/remove test rework