Progress on tests