Added lazy feature fetching and tests