Fixes to the entity parser, the test case now makes use of it.