Add verify state
Add bucket types with varying n_val to the testing mix