Fix string parsing and update tests
Merge branch 'develop'