First pass at bucket testing