Fixing tests I broke