New Archive test created + refactoring + enhancing relevant objects