TRUNK-2303: fixed 6 decimal formatting and test cases