Tidied test script