Workaround is no longer needed - relevant JIRA was verified
New Archive test created + refactoring + enhancing relevant objects