All tests pass with new list regime - lots of tidying up still needed