one more rename
add legacy resolve tests for variables