Minor configuration changes for Unit Testing