variable name changes and remove comment in test

just some minor changes; I learned about the relational gotchas and removed a comment from the tests, too.

Are you happy with the current state or should I wait before committing?