config test bug fix and cleanup