Lots of changes ... include tests for the overhaul.