Add tests for Archive on service plus minor service refactorings