Parsse some more and add tests
Merge branch 'master' of https://github.com/sih/traffic