Just a couple of minor things maintenance.

@juliusv See the commits for details. One of the tests was actually broken ever since the timestamp was switched to ms.