NEXUS-6019: Improvements to load method and more UT