Fix tests for contact set
Fix unit tests for Bucket module