changes for configuration and tests