More work on tests