Disabled grid type check and updated derivative tests