More constants and some small fixes to the test script