Refactor specs to not have duplicate saved XML