Added some regex tests for all four possible formats