Add tests
Fix Variable Variable problem