* also update tests to match code changes