Adds some tests and fixes BindZone save method