Polish tests a bit, add in a test script