Improve handling of variable syntax
Ensure tested commands fire correctly
Only compare variable range for .equals()
Update variable tests to match latest changes