Bump version number to test3
Fix uses of the old min() macro
Fix uses of the old min() macro