Fix bug in columnset w/ interpolation
Rename components of formula
Tweak tests
Fix another interpolation bug
Fix variable names in tests
Fix interpolation for ~ macro
Massive variable rename