Clean up KBucketEntry and add more tests