variable renamings and tests, WIP on issue #4