Fixed broken tests
Support for helper methods in bindign