Add some more tests and refactor TreasureDataTests