Minor tidying.
Adding an option for --skipbasics to encourage data-oriented unit testing.