fixing tests broken by other changes after first review