#2327 re includes things removed in r18098 and added test to cover archiving.

git-svn-id: https://chaste.cs.ox.ac.uk/svn/chaste/trunk@18672 b5f69653-2bf5-0310-8201-b0dafb8e1405