Lint Fix
Merge pull request #1402 from psav/lint_fix

Lint Fix
INTERNAL ERRORs caused issues with artifactor

location item was not available before test was started, this is now
handled correctly.
Merge pull request #1403 from psav/artifactor_location

INTERNAL ERRORs caused issues with artifactor