[No reviewer] Add extra UTs

Add couple more UTs and tweak bucket counting