fixed failing tests (variable name changes)