Updated all but library tests
Fixed tests to conform to new lazy loading of classes
Merged with CL
Added back inherited checks and corrected comments
Removed comment