Fixed broken tests from previous commit.