ES-149 tests fix