Refactor proxy test into conditional expression.
Refactor to ensure factories are taking control of construction.