[Issue #121] Update test cases to fetch required fields explicitly