Little bit of work on tests.