Minor tweaks to test_lazy_load