Add test for Issue #305
Partial fix Issue #135 variable binding