Fix failing tests after merging in the many disparate branches