update tests to conform to new dispatch policy