update tests to new semantics