Fix tests. I would have gotten away with it too if it weren't for them