Updates for config
Further config cleanup and test usage