Updated a few tests and code after getting feedback.

Made bucket testing more specific by looking at the name as
opposed to the number of buckets.  Eliminated some imports and
variables that were unused.  Fixed some spelling errors.