Fixed a few tests accidentally broken in the last commit