WIP: Continue to overhaul testing.  Get --simple mode working.