added configuration files for test and production environments
adjusted testing settings
refactoring towards a cleaner integration of OCH support