#2: Missed some test changes