Use correct date format in test
Put actual and expected at the right places in test
Merge branch 'release' into upstream