Issue 118 Fix failing tests; elements of a collections should be loaded lazily or eagerly and not mix
Fix Issue 118, Keep using unenhance strategy