Push up code to get help with tests.
Initial work on tests.