Added some aditional test cases , cleaned up the GetBucket method and added a range check to prevent an infinite loop
Undid a temp test change in one of the test cases