Add lazyloader and unit test fix