fixing tests after charlie's errors