Add missing arguments to operator test
Adjust entity import usage
Adjust comment for exceptions