ARQ-1634 Replacing tests with Unsafe to avoid instance construction