more progress on failing tests