Continue working on tests.