Make functional test script handle tags
Clean build script