DELTASPIKE-399 Refactored tests to not require OWB changes.