Improve tests and UTC handling.