Updating & better support for dirty objects.
Using new reset method to simplify test setup.
A TODO.