fix(archive): minor changes and test fixes.

SD-332