Fix some config stuff.  Mas tests