Implement update test and mild refactor