Fixing more tests. This is a bit ridiculous.