Minor clean up for Configuration test