Fix tests (ecs -> es)