Fixed/extended ADT errors
Fixed entity names
Switched runner arguments