Remove and update of entry now work and naive test added