work towards fixing tests