2 files changed, 10 insertions, 24 deletions
diff --git a/modules/codec/tests/codec.cpp b/modules/codec/tests/codec.cpp
index fb599e3..e2a9958 100644
--- a/modules/codec/tests/codec.cpp
+++ b/modules/codec/tests/codec.cpp
@@ -75,7 +75,7 @@ SAW_TEST("One dimensional Array Add"){
 	arr.add(7);
 
 	SAW_EXPECT(arr.size() == 6u, "Array size is not 6u. Expected that data stays correct");
-	SAW_EXPECT(arr.at(6u).get() == 7, "Array at 6u is not 7. Expected that data stays correct");
+	SAW_EXPECT(arr.at(5u).get() == 7, "Array at 5u is not 7. Expected that data stays correct");
 }
 
 SAW_TEST("Two Dimensional Array") {
diff --git a/modules/codec/tests/csv.cpp b/modules/codec/tests/csv.cpp
index 507d4cb..6c28533 100644
--- a/modules/codec/tests/csv.cpp
+++ b/modules/codec/tests/csv.cpp
@@ -8,40 +8,26 @@ namespace {
 namespace schema {
 using namespace saw::schema;
 
-using ZeroDimArray = Array<Int32,0>;
-using OneDimArray = Array<Int32,1>;
-using TwoDimArray = Array<Int32,2>;
-using ThreeDimArray = Array<Int32,3>;
-
 using TestStruct = Struct<
 	Member<String, "string">,
 	Member<UInt64, "number">
 >;
 
-using TestUnion = Union<
-	Member<TwoDimArray, "two_dim_array">,
-	Member<UInt64, "number">
->;
-
-using TestTuple = Tuple<
-	TwoDimArray,
-	UInt64
->;
-
-using TestInt32Pair = Tuple<
-	Int32,
-	Int32
+using TestArray = Array<
+	TestStruct
 >;
 
 SAW_TEST("Codec Csv Encode Basic"){
 	using namespace saw;
 
-	data <TestStruct, encode::Native> native_data;
-	native_data.template get<"string">().set("foo");
-	native_data.template get<"number">().set(140u);
+	data <TestArray, encode::Native> native_data{1};
+	auto& row = native_data.at(0);
+
+	row.template get<"string">().set("foo");
+	row.template get<"number">().set(140u);
 
-	data <TestStruct, encode::Csv> csv_data;
-	codec<TestStruct, encode::Csv> csv_codec;
+	data <TestArray, encode::Csv> csv_data;
+	codec<TestArray, encode::Csv> csv_codec;
 
 	auto eov = csv_codec.encode(native_data, csv_data);
 	SAW_EXPECT(eov.is_value(), "Couldn't encode data");