#2452 Tidy up the permutation saving checks and complete the failing test. (Closes ticket.)

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