Added a couple new tests to controller expand/contract.