Add test coverage for fancier fetch scenarios