Add more expr tests, refactor test script