more progress on tests