alphabetise tests and remove inter-test dependencies