Cleaned up out additional requires are added
Added test for define.Class assign
Added support for converting define/define.Class used as part of assignment