Rev version and fix tests