Expand variable name, add comment and fix tests.