Framing tests pass; required minor framing changes to expansion.