improve bindings parser, include bindings test