Fixed the tests I broke in the last commit