Added tests for expandable things.
Merge.