Minor fixes to the rockspec and test script