Merge tests and Version bump