multiple changes

passing moc, singleton datetimeformat,