Config changes and testing