test case fixes for Issue#293
Modified for lazy fetching.