Issue #2317353 by omissis: refactored unit tests to integration tests and fixed context value usage.