Fixed tests for the ES upgrade