Fix a few more tests for UniqueId and move some tests fo HBaseStore