Make all tests pass

We are skipping html entities for now, will address them later.