support for archives, updated tests