Fixing tablet field updates in a couple places.

Also updating the tests properly.