More functional update test code