Fixed tests after resolving git conflict issues

I hadn't updated my tests before my previous pull request went through. This should fix all of them and they should run.