Factor tests to reflect new semantics