Tidied up test user interface