Config fixes an tests