update tests to be consistent with changes