Upgrading the entity class and completing the orc attack test