Some minor tidying of the top level tests