Fixed up some config and tests