Slight reorg.
Initial implementation of expression testing.