Added correct time parsing + tests