Fixed failing tests that broke from merging in unrelated changes