Simplify test script a little bit.