Started some work on tests.
Started some work on tests.