Add a more complex update test
Add remove test