2 failing tests

Saw you fix for the back tick identifiers, but there are some more edge cases.