Merge "Attempt at fixing broken tests and regressing performance." into nyc-andromeda-dev