Make version name unique and fix tests