instead of 'with-redefs' now using a dynamic var