Add parsing tests
Update test
Add support for voting