Fixes to ngc files for auto testing