Follow up to use SimpleDateFormat instead of Calendar object in unit tests  - TRUNK-4472