Improve time parsing from map file
fix functional tests