Remove extra binding directory.
Fix tests.