More progress on tests