DELTASPIKE-773 improved support for simple test environments