Merge pull request #66 from ichernev/fix-test-parse