Further work on tests