Fix for calls from internal classes
Removed dead code
Added copy of test operations