Updated version and tests