Merge "Attempt at fixing broken tests and regressing performance."