make sure raw delivery unit test works in any environment
adjusted log levels to debug
removed unnecessary imports
moved raw attribute lookup into caching layer