add tests to cover new entity parsing