Refactoring test with lazy loading.