Started some work on tests.