allow use of $ in variable names and update tests