Tidied up test names, removed old test