Expand test cases
Switch from Calendar to SimpleDateFormatter