Comment out updating
Add missing tests