Remove hard-coded internal variable name from test
Add two more tests (one currently fails)