Code cleanup. Add return values for update methods. Write update method unit tests. Code cleanup on existing tests.