FormatShortDateAndTime add + refactoring + added tests to handle also time with zeros