Moved some types around.  New config now tested in integration too.