Added tests for hydrator