Tidying / refactoring before removal of sub-series.

These were disabled because they deal with sub-series which have been removed but not yet fixed.  Leaving the disabled tests there is meant to serve as a reminder to update them once the removal of sub-series is complete.