Update tests to test Fields setting in addition to loading