correct some testing changes, now use config settings