Fixed a bunch of failed tests