DELTASPIKE-785 added unit-test, unified handling and config-name