refactored execution context; and added config
fixing git error by re-adding rest servlet test