Minor work on tests