Start with UnitTest for Bucketizer, several cleanups