diff --git a/libwccl/values/strset.h b/libwccl/values/strset.h
index 5e9defa11ed83437b7f718fb30e0fa03aa37156b..ccb38c508a5ff5dbe3609417edc722f4425605e8 100644
--- a/libwccl/values/strset.h
+++ b/libwccl/values/strset.h
@@ -36,8 +36,8 @@ class StrSet : public Value
 public:
 	WCCL_VALUE_PREAMBLE
 
-	typedef boost::unordered_set<UnicodeString> value_type;
-	//typedef std::set<UnicodeString> value_type;
+	//typedef boost::unordered_set<UnicodeString> value_type;
+	typedef std::set<UnicodeString> value_type;
 
 	StrSet()
 		: set_()
diff --git a/tests/data/lex_test.ccl b/tests/data/lex_test.ccl
index d1d6d5b383a4bd3eb8e9b77a6d2eba3459fc2984..8c50245cc790f5ec48d266bc584a4bb4c645f5e6 100644
--- a/tests/data/lex_test.ccl
+++ b/tests/data/lex_test.ccl
@@ -28,5 +28,5 @@ tagset=nkjp
 ---
 []
 
-["part", "part2", "adv"]
+["adv", "part", "part2"]
 ---
diff --git a/tests/data/string.ccl b/tests/data/string.ccl
index 7aa3136f555aaca8ec75ca4551c27eacbc5bf02f..1effdc10416ac1c3be27b5d469cda0aa2ebc9240 100644
--- a/tests/data/string.ccl
+++ b/tests/data/string.ccl
@@ -14,7 +14,7 @@ upper(["Schlüssel", "ěêĕ"])
 ---
 affix(["pijÄ…cy", "jedzÄ…cy", "jedzÄ…ca", "ca"], -3)
 
-["Ä…ca", "Ä…cy", "ca"]
+["ca", "Ä…ca", "Ä…cy"]
 ---
 affix(["ökonomisch", "ökologisch", "oko", "okoń", "ok"], 3)