update tests to keep in sync with v4