Now saving "finishedAt" as timestamp
Fixed edge case and added unit test