Added test; Fixed an issue in binding