Extended test and implementation to handle lazy loading of collection