More work on tests.