Tidied up some tests, fixed up names, removed duplication.