- redesigned bindings testing and fixing