diff --git a/src/unittest/test_irr_gltf_mesh_loader.cpp b/src/unittest/test_irr_gltf_mesh_loader.cpp
index 418137b39..7871216bd 100644
--- a/src/unittest/test_irr_gltf_mesh_loader.cpp
+++ b/src/unittest/test_irr_gltf_mesh_loader.cpp
@@ -57,6 +57,9 @@ class ScopedMesh
 	irr::scene::IAnimatedMesh* m_mesh;
 };
 
+using v3f = irr::core::vector3df;
+using v2f = irr::core::vector2df;
+
 TEST_CASE("load empty gltf file") {
 	ScopedMesh sm(XSTR(UNITTEST_ASSETS_DIRECTORY) "empty.gltf");
 	CHECK(sm.getMesh() == nullptr);
@@ -75,19 +78,17 @@ TEST_CASE("minimal triangle") {
 
 	SECTION("vertex coordinates are correct") {
 		REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 3);
-		irr::video::S3DVertex vertices[3];
-		std::memcpy(vertices, sm.getMesh()->getMeshBuffer(0)->getVertices(),
-			3 * sizeof(irr::video::S3DVertex));
-		CHECK(vertices[0].Pos == irr::core::vector3df {0.0f, 0.0f, 0.0f});
-		CHECK(vertices[1].Pos == irr::core::vector3df {1.0f, 0.0f, 0.0f});
-		CHECK(vertices[2].Pos == irr::core::vector3df {0.0f, 1.0f, 0.0f});
+		auto vertices = static_cast<const irr::video::S3DVertex *>(
+				sm.getMesh()->getMeshBuffer(0)->getVertices());
+		CHECK(vertices[0].Pos == v3f {0.0f, 0.0f, 0.0f});
+		CHECK(vertices[1].Pos == v3f {1.0f, 0.0f, 0.0f});
+		CHECK(vertices[2].Pos == v3f {0.0f, 1.0f, 0.0f});
 	}
 
 	SECTION("vertex indices are correct") {
 		REQUIRE(sm.getMesh()->getMeshBuffer(0)->getIndexCount() == 3);
-		irr::u16 indices[3];
-		std::memcpy(indices, sm.getMesh()->getMeshBuffer(0)->getIndices(),
-			3 * sizeof(irr::u16));
+		auto indices = static_cast<const irr::u16 *>(
+				sm.getMesh()->getMeshBuffer(0)->getIndices());
 		CHECK(indices[0] == 2);
 		CHECK(indices[1] == 1);
 		CHECK(indices[2] == 0);
@@ -100,24 +101,22 @@ TEST_CASE("blender cube") {
 	REQUIRE(sm.getMesh()->getMeshBufferCount() == 1);
 	SECTION("vertex coordinates are correct") {
 		REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24);
-		irr::video::S3DVertex vertices[24];
-		std::memcpy(vertices, sm.getMesh()->getMeshBuffer(0)->getVertices(),
-			24 * sizeof(irr::video::S3DVertex));
-		CHECK(vertices[0].Pos == irr::core::vector3df{-10.0f, -10.0f, -10.0f});
-		CHECK(vertices[3].Pos == irr::core::vector3df{-10.0f, 10.0f, -10.0f});
-		CHECK(vertices[6].Pos == irr::core::vector3df{-10.0f, -10.0f, 10.0f});
-		CHECK(vertices[9].Pos == irr::core::vector3df{-10.0f, 10.0f, 10.0f});
-		CHECK(vertices[12].Pos == irr::core::vector3df{10.0f, -10.0f, -10.0f});
-		CHECK(vertices[15].Pos == irr::core::vector3df{10.0f, 10.0f, -10.0f});
-		CHECK(vertices[18].Pos == irr::core::vector3df{10.0f, -10.0f, 10.0f});
-		CHECK(vertices[21].Pos == irr::core::vector3df{10.0f, 10.0f, 10.0f});
+		auto vertices = static_cast<const irr::video::S3DVertex *>(
+				sm.getMesh()->getMeshBuffer(0)->getVertices());
+		CHECK(vertices[0].Pos == v3f{-10.0f, -10.0f, -10.0f});
+		CHECK(vertices[3].Pos == v3f{-10.0f, 10.0f, -10.0f});
+		CHECK(vertices[6].Pos == v3f{-10.0f, -10.0f, 10.0f});
+		CHECK(vertices[9].Pos == v3f{-10.0f, 10.0f, 10.0f});
+		CHECK(vertices[12].Pos == v3f{10.0f, -10.0f, -10.0f});
+		CHECK(vertices[15].Pos == v3f{10.0f, 10.0f, -10.0f});
+		CHECK(vertices[18].Pos == v3f{10.0f, -10.0f, 10.0f});
+		CHECK(vertices[21].Pos == v3f{10.0f, 10.0f, 10.0f});
 	}
 
 	SECTION("vertex indices are correct") {
 		REQUIRE(sm.getMesh()->getMeshBuffer(0)->getIndexCount() == 36);
-		irr::u16 indices[36];
-		std::memcpy(indices, sm.getMesh()->getMeshBuffer(0)->getIndices(),
-			36 * sizeof(irr::u16));
+		auto indices = static_cast<const irr::u16 *>(
+				sm.getMesh()->getMeshBuffer(0)->getIndices());
 		CHECK(indices[0] == 16);
 		CHECK(indices[1] == 5);
 		CHECK(indices[2] == 22);
@@ -126,28 +125,26 @@ TEST_CASE("blender cube") {
 
 	SECTION("vertex normals are correct") {
 		REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24);
-		irr::video::S3DVertex vertices[24];
-		std::memcpy(vertices, sm.getMesh()->getMeshBuffer(0)->getVertices(),
-			24 * sizeof(irr::video::S3DVertex));
-		CHECK(vertices[0].Normal == irr::core::vector3df{-1.0f, 0.0f, 0.0f});
-		CHECK(vertices[1].Normal == irr::core::vector3df{0.0f, -1.0f, 0.0f});
-		CHECK(vertices[2].Normal == irr::core::vector3df{0.0f, 0.0f, -1.0f});
-		CHECK(vertices[3].Normal == irr::core::vector3df{-1.0f, 0.0f, 0.0f});
-		CHECK(vertices[6].Normal == irr::core::vector3df{-1.0f, 0.0f, 0.0f});
-		CHECK(vertices[23].Normal == irr::core::vector3df{1.0f, 0.0f, 0.0f});
+		auto vertices = static_cast<const irr::video::S3DVertex *>(
+				sm.getMesh()->getMeshBuffer(0)->getVertices());
+		CHECK(vertices[0].Normal == v3f{-1.0f, 0.0f, 0.0f});
+		CHECK(vertices[1].Normal == v3f{0.0f, -1.0f, 0.0f});
+		CHECK(vertices[2].Normal == v3f{0.0f, 0.0f, -1.0f});
+		CHECK(vertices[3].Normal == v3f{-1.0f, 0.0f, 0.0f});
+		CHECK(vertices[6].Normal == v3f{-1.0f, 0.0f, 0.0f});
+		CHECK(vertices[23].Normal == v3f{1.0f, 0.0f, 0.0f});
 
 	}
 
 	SECTION("texture coords are correct") {
 		REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24);
-		irr::video::S3DVertex vertices[24];
-		std::memcpy(vertices, sm.getMesh()->getMeshBuffer(0)->getVertices(),
-			24 * sizeof(irr::video::S3DVertex));
-		CHECK(vertices[0].TCoords == irr::core::vector2df{0.375f, 1.0f});
-		CHECK(vertices[1].TCoords == irr::core::vector2df{0.125f, 0.25f});
-		CHECK(vertices[2].TCoords == irr::core::vector2df{0.375f, 0.0f});
-		CHECK(vertices[3].TCoords == irr::core::vector2df{0.6250f, 1.0f});
-		CHECK(vertices[6].TCoords == irr::core::vector2df{0.375f, 0.75f});
+		auto vertices = static_cast<const irr::video::S3DVertex *>(
+				sm.getMesh()->getMeshBuffer(0)->getVertices());
+		CHECK(vertices[0].TCoords == v2f{0.375f, 1.0f});
+		CHECK(vertices[1].TCoords == v2f{0.125f, 0.25f});
+		CHECK(vertices[2].TCoords == v2f{0.375f, 0.0f});
+		CHECK(vertices[3].TCoords == v2f{0.6250f, 1.0f});
+		CHECK(vertices[6].TCoords == v2f{0.375f, 0.75f});
 	}
 }
 
@@ -168,18 +165,17 @@ TEST_CASE("blender cube scaled") {
 	
 	SECTION("Scaling is correct") {
 		REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24);
-		irr::video::S3DVertex vertices[24];
-		std::memcpy(vertices, sm.getMesh()->getMeshBuffer(0)->getVertices(),
-			24 * sizeof(irr::video::S3DVertex));
+		auto vertices = static_cast<const irr::video::S3DVertex *>(
+				sm.getMesh()->getMeshBuffer(0)->getVertices());
 
-		CHECK(vertices[0].Pos == irr::core::vector3df{-150.0f, -1.0f, -21.5f});
-		CHECK(vertices[3].Pos == irr::core::vector3df{-150.0f, 1.0f, -21.5f});
-		CHECK(vertices[6].Pos == irr::core::vector3df{-150.0f, -1.0f, 21.5f});
-		CHECK(vertices[9].Pos == irr::core::vector3df{-150.0f, 1.0f, 21.5f});
-		CHECK(vertices[12].Pos == irr::core::vector3df{150.0f, -1.0f, -21.5f});
-		CHECK(vertices[15].Pos == irr::core::vector3df{150.0f, 1.0f, -21.5f});
-		CHECK(vertices[18].Pos == irr::core::vector3df{150.0f, -1.0f, 21.5f});
-		CHECK(vertices[21].Pos == irr::core::vector3df{150.0f, 1.0f, 21.5f});
+		CHECK(vertices[0].Pos == v3f{-150.0f, -1.0f, -21.5f});
+		CHECK(vertices[3].Pos == v3f{-150.0f, 1.0f, -21.5f});
+		CHECK(vertices[6].Pos == v3f{-150.0f, -1.0f, 21.5f});
+		CHECK(vertices[9].Pos == v3f{-150.0f, 1.0f, 21.5f});
+		CHECK(vertices[12].Pos == v3f{150.0f, -1.0f, -21.5f});
+		CHECK(vertices[15].Pos == v3f{150.0f, 1.0f, -21.5f});
+		CHECK(vertices[18].Pos == v3f{150.0f, -1.0f, 21.5f});
+		CHECK(vertices[21].Pos == v3f{150.0f, 1.0f, 21.5f});
 	}
 }
 
@@ -190,23 +186,22 @@ TEST_CASE("blender cube matrix transform") {
 	
 	SECTION("Transformation is correct") {
 		REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24);
-		irr::video::S3DVertex vertices[24];
-		std::memcpy(vertices, sm.getMesh()->getMeshBuffer(0)->getVertices(),
-			24 * sizeof(irr::video::S3DVertex));
-		const auto checkVertex = [&](const std::size_t i, irr::core::vector3df vec) {
+		auto vertices = static_cast<const irr::video::S3DVertex *>(
+				sm.getMesh()->getMeshBuffer(0)->getVertices());
+		const auto checkVertex = [&](const std::size_t i, v3f vec) {
 			// The transform scales by (1, 2, 3) and translates by (4, 5, 6).
-			CHECK(vertices[i].Pos == vec * irr::core::vector3df{1, 2, 3}
+			CHECK(vertices[i].Pos == vec * v3f{1, 2, 3}
 					// The -6 is due to the coordinate system conversion.
-					+ irr::core::vector3df{4, 5, -6});
+					+ v3f{4, 5, -6});
 		};
-		checkVertex(0, irr::core::vector3df{-1, -1, -1});
-		checkVertex(3, irr::core::vector3df{-1, 1, -1});
-		checkVertex(6, irr::core::vector3df{-1, -1, 1});
-		checkVertex(9, irr::core::vector3df{-1, 1, 1});
-		checkVertex(12, irr::core::vector3df{1, -1, -1});
-		checkVertex(15, irr::core::vector3df{1, 1, -1});
-		checkVertex(18, irr::core::vector3df{1, -1, 1});
-		checkVertex(21, irr::core::vector3df{1, 1, 1});
+		checkVertex(0, v3f{-1, -1, -1});
+		checkVertex(3, v3f{-1, 1, -1});
+		checkVertex(6, v3f{-1, -1, 1});
+		checkVertex(9, v3f{-1, 1, 1});
+		checkVertex(12, v3f{1, -1, -1});
+		checkVertex(15, v3f{1, 1, -1});
+		checkVertex(18, v3f{1, -1, 1});
+		checkVertex(21, v3f{1, 1, 1});
 	}
 }
 
@@ -217,146 +212,148 @@ TEST_CASE("snow man") {
 
 	SECTION("vertex coordinates are correct for all buffers") {
 		REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24);
-		irr::video::S3DVertex vertices[24];
-		std::memcpy(vertices, sm.getMesh()->getMeshBuffer(0)->getVertices(),
-			24 * sizeof(irr::video::S3DVertex));
-		
-		CHECK(vertices[0].Pos == irr::core::vector3df{3.0f, 24.0f, -3.0f});
-		CHECK(vertices[3].Pos == irr::core::vector3df{3.0f, 18.0f, 3.0f});
-		CHECK(vertices[6].Pos == irr::core::vector3df{-3.0f, 18.0f, -3.0f});
-		CHECK(vertices[9].Pos == irr::core::vector3df{3.0f, 24.0f, 3.0f});
-		CHECK(vertices[12].Pos == irr::core::vector3df{3.0f, 18.0f, -3.0f});
-		CHECK(vertices[15].Pos == irr::core::vector3df{-3.0f, 18.0f, 3.0f});
-		CHECK(vertices[18].Pos == irr::core::vector3df{3.0f, 18.0f, -3.0f});
-		CHECK(vertices[21].Pos == irr::core::vector3df{3.0f, 18.0f, 3.0f});
-		
-		REQUIRE(sm.getMesh()->getMeshBuffer(1)->getVertexCount() == 24);
-		std::memcpy(vertices, sm.getMesh()->getMeshBuffer(1)->getVertices(),
-			24 * sizeof(irr::video::S3DVertex));
-		
-		CHECK(vertices[2].Pos == irr::core::vector3df{5.0f, 10.0f, 5.0f});
-		CHECK(vertices[3].Pos == irr::core::vector3df{5.0f, 0.0f, 5.0f});
-		CHECK(vertices[7].Pos == irr::core::vector3df{-5.0f, 0.0f, 5.0f});
-		CHECK(vertices[8].Pos == irr::core::vector3df{5.0f, 10.0f, -5.0f});
-		CHECK(vertices[14].Pos == irr::core::vector3df{5.0f, 0.0f, 5.0f});
-		CHECK(vertices[16].Pos == irr::core::vector3df{5.0f, 10.0f, -5.0f});
-		CHECK(vertices[22].Pos == irr::core::vector3df{-5.0f, 10.0f, 5.0f});
-		CHECK(vertices[23].Pos == irr::core::vector3df{-5.0f, 0.0f, 5.0f});
-
-		REQUIRE(sm.getMesh()->getMeshBuffer(2)->getVertexCount() == 24);
-		std::memcpy(vertices, sm.getMesh()->getMeshBuffer(2)->getVertices(),
-			24 * sizeof(irr::video::S3DVertex));
-		
-		CHECK(vertices[1].Pos == irr::core::vector3df{4.0f, 10.0f, -4.0f});
-		CHECK(vertices[2].Pos == irr::core::vector3df{4.0f, 18.0f, 4.0f});
-		CHECK(vertices[3].Pos == irr::core::vector3df{4.0f, 10.0f, 4.0f});
-		CHECK(vertices[10].Pos == irr::core::vector3df{-4.0f, 18.0f, -4.0f});
-		CHECK(vertices[11].Pos == irr::core::vector3df{-4.0f, 18.0f, 4.0f});
-		CHECK(vertices[12].Pos == irr::core::vector3df{4.0f, 10.0f, -4.0f});
-		CHECK(vertices[17].Pos == irr::core::vector3df{-4.0f, 18.0f, -4.0f});
-		CHECK(vertices[18].Pos == irr::core::vector3df{4.0f, 10.0f, -4.0f});
+		{
+			auto vertices = static_cast<const irr::video::S3DVertex *>(
+					sm.getMesh()->getMeshBuffer(0)->getVertices());
+			CHECK(vertices[0].Pos == v3f{3.0f, 24.0f, -3.0f});
+			CHECK(vertices[3].Pos == v3f{3.0f, 18.0f, 3.0f});
+			CHECK(vertices[6].Pos == v3f{-3.0f, 18.0f, -3.0f});
+			CHECK(vertices[9].Pos == v3f{3.0f, 24.0f, 3.0f});
+			CHECK(vertices[12].Pos == v3f{3.0f, 18.0f, -3.0f});
+			CHECK(vertices[15].Pos == v3f{-3.0f, 18.0f, 3.0f});
+			CHECK(vertices[18].Pos == v3f{3.0f, 18.0f, -3.0f});
+			CHECK(vertices[21].Pos == v3f{3.0f, 18.0f, 3.0f});
+		}
+		{
+			REQUIRE(sm.getMesh()->getMeshBuffer(1)->getVertexCount() == 24);
+			auto vertices = static_cast<const irr::video::S3DVertex *>(
+					sm.getMesh()->getMeshBuffer(1)->getVertices());
+			CHECK(vertices[2].Pos == v3f{5.0f, 10.0f, 5.0f});
+			CHECK(vertices[3].Pos == v3f{5.0f, 0.0f, 5.0f});
+			CHECK(vertices[7].Pos == v3f{-5.0f, 0.0f, 5.0f});
+			CHECK(vertices[8].Pos == v3f{5.0f, 10.0f, -5.0f});
+			CHECK(vertices[14].Pos == v3f{5.0f, 0.0f, 5.0f});
+			CHECK(vertices[16].Pos == v3f{5.0f, 10.0f, -5.0f});
+			CHECK(vertices[22].Pos == v3f{-5.0f, 10.0f, 5.0f});
+			CHECK(vertices[23].Pos == v3f{-5.0f, 0.0f, 5.0f});
+		}
+		{
+			REQUIRE(sm.getMesh()->getMeshBuffer(2)->getVertexCount() == 24);
+			auto vertices = static_cast<const irr::video::S3DVertex *>(
+					sm.getMesh()->getMeshBuffer(2)->getVertices());
+			CHECK(vertices[1].Pos == v3f{4.0f, 10.0f, -4.0f});
+			CHECK(vertices[2].Pos == v3f{4.0f, 18.0f, 4.0f});
+			CHECK(vertices[3].Pos == v3f{4.0f, 10.0f, 4.0f});
+			CHECK(vertices[10].Pos == v3f{-4.0f, 18.0f, -4.0f});
+			CHECK(vertices[11].Pos == v3f{-4.0f, 18.0f, 4.0f});
+			CHECK(vertices[12].Pos == v3f{4.0f, 10.0f, -4.0f});
+			CHECK(vertices[17].Pos == v3f{-4.0f, 18.0f, -4.0f});
+			CHECK(vertices[18].Pos == v3f{4.0f, 10.0f, -4.0f});
+		}
 	}
 
 	SECTION("vertex indices are correct for all buffers") {
-		REQUIRE(sm.getMesh()->getMeshBuffer(0)->getIndexCount() == 36);
-		irr::u16 indices[36];
-		std::memcpy(indices, sm.getMesh()->getMeshBuffer(0)->getIndices(),
-			36 * sizeof(irr::u16));
-		CHECK(indices[0] == 23);
-		CHECK(indices[1] == 21);
-		CHECK(indices[2] == 22);
-		CHECK(indices[35] == 2);
-
-		REQUIRE(sm.getMesh()->getMeshBuffer(1)->getIndexCount() == 36);
-		std::memcpy(indices, sm.getMesh()->getMeshBuffer(1)->getIndices(),
-			36 * sizeof(irr::u16));
-		CHECK(indices[10] == 16);
-		CHECK(indices[11] == 18);
-		CHECK(indices[15] == 13);
-		CHECK(indices[27] == 5);
-
-		REQUIRE(sm.getMesh()->getMeshBuffer(2)->getIndexCount() == 36);
-		std::memcpy(indices, sm.getMesh()->getMeshBuffer(2)->getIndices(),
-			36 * sizeof(irr::u16));
-		CHECK(indices[26] == 6);
-		CHECK(indices[27] == 5);
-		CHECK(indices[29] == 6);
-		CHECK(indices[32] == 2);
+		{
+			REQUIRE(sm.getMesh()->getMeshBuffer(0)->getIndexCount() == 36);
+			auto indices = static_cast<const irr::u16 *>(
+					sm.getMesh()->getMeshBuffer(0)->getIndices());
+			CHECK(indices[0] == 23);
+			CHECK(indices[1] == 21);
+			CHECK(indices[2] == 22);
+			CHECK(indices[35] == 2);
+		}
+		{
+			REQUIRE(sm.getMesh()->getMeshBuffer(1)->getIndexCount() == 36);
+			auto indices = static_cast<const irr::u16 *>(
+					sm.getMesh()->getMeshBuffer(1)->getIndices());
+			CHECK(indices[10] == 16);
+			CHECK(indices[11] == 18);
+			CHECK(indices[15] == 13);
+			CHECK(indices[27] == 5);
+		}
+		{
+			REQUIRE(sm.getMesh()->getMeshBuffer(2)->getIndexCount() == 36);
+			auto indices = static_cast<const irr::u16 *>(
+					sm.getMesh()->getMeshBuffer(2)->getIndices());
+			CHECK(indices[26] == 6);
+			CHECK(indices[27] == 5);
+			CHECK(indices[29] == 6);
+			CHECK(indices[32] == 2);
+		}
 	}
 
 	
 	SECTION("vertex normals are correct for all buffers") {
-		REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24);
-		irr::video::S3DVertex vertices[24];
-		std::memcpy(vertices, sm.getMesh()->getMeshBuffer(0)->getVertices(),
-			24 * sizeof(irr::video::S3DVertex));
-		CHECK(vertices[0].Normal == irr::core::vector3df{1.0f, 0.0f, -0.0f});
-		CHECK(vertices[1].Normal == irr::core::vector3df{1.0f, 0.0f, -0.0f});
-		CHECK(vertices[2].Normal == irr::core::vector3df{1.0f, 0.0f, -0.0f});
-		CHECK(vertices[3].Normal == irr::core::vector3df{1.0f, 0.0f, -0.0f});
-		CHECK(vertices[6].Normal == irr::core::vector3df{-1.0f, 0.0f, -0.0f});
-		CHECK(vertices[23].Normal == irr::core::vector3df{0.0f, 0.0f, 1.0f});
-
-		REQUIRE(sm.getMesh()->getMeshBuffer(1)->getVertexCount() == 24);
-		std::memcpy(vertices, sm.getMesh()->getMeshBuffer(1)->getVertices(),
-			24 * sizeof(irr::video::S3DVertex));
-		
-		CHECK(vertices[0].Normal == irr::core::vector3df{1.0f, 0.0f, -0.0f});
-		CHECK(vertices[1].Normal == irr::core::vector3df{1.0f, 0.0f, -0.0f});
-		CHECK(vertices[3].Normal == irr::core::vector3df{1.0f, 0.0f, -0.0f});
-		CHECK(vertices[6].Normal == irr::core::vector3df{-1.0f, 0.0f, -0.0f});
-		CHECK(vertices[7].Normal == irr::core::vector3df{-1.0f, 0.0f, -0.0f});
-		CHECK(vertices[22].Normal == irr::core::vector3df{0.0f, 0.0f, 1.0f});
-
-
-		REQUIRE(sm.getMesh()->getMeshBuffer(2)->getVertexCount() == 24);
-		std::memcpy(vertices, sm.getMesh()->getMeshBuffer(2)->getVertices(),
-			24 * sizeof(irr::video::S3DVertex));
-
-		CHECK(vertices[3].Normal == irr::core::vector3df{1.0f, 0.0f, -0.0f});
-		CHECK(vertices[4].Normal == irr::core::vector3df{-1.0f, 0.0f, -0.0f});
-		CHECK(vertices[5].Normal == irr::core::vector3df{-1.0f, 0.0f, -0.0f});
-		CHECK(vertices[10].Normal == irr::core::vector3df{0.0f, 1.0f, -0.0f});
-		CHECK(vertices[11].Normal == irr::core::vector3df{0.0f, 1.0f, -0.0f});
-		CHECK(vertices[19].Normal == irr::core::vector3df{0.0f, 0.0f, -1.0f});
-
+		{
+			REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24);
+			auto vertices = static_cast<const irr::video::S3DVertex *>(
+					sm.getMesh()->getMeshBuffer(0)->getVertices());
+			CHECK(vertices[0].Normal == v3f{1.0f, 0.0f, -0.0f});
+			CHECK(vertices[1].Normal == v3f{1.0f, 0.0f, -0.0f});
+			CHECK(vertices[2].Normal == v3f{1.0f, 0.0f, -0.0f});
+			CHECK(vertices[3].Normal == v3f{1.0f, 0.0f, -0.0f});
+			CHECK(vertices[6].Normal == v3f{-1.0f, 0.0f, -0.0f});
+			CHECK(vertices[23].Normal == v3f{0.0f, 0.0f, 1.0f});
+		}
+		{
+			REQUIRE(sm.getMesh()->getMeshBuffer(1)->getVertexCount() == 24);
+			auto vertices = static_cast<const irr::video::S3DVertex *>(
+					sm.getMesh()->getMeshBuffer(1)->getVertices());
+			CHECK(vertices[0].Normal == v3f{1.0f, 0.0f, -0.0f});
+			CHECK(vertices[1].Normal == v3f{1.0f, 0.0f, -0.0f});
+			CHECK(vertices[3].Normal == v3f{1.0f, 0.0f, -0.0f});
+			CHECK(vertices[6].Normal == v3f{-1.0f, 0.0f, -0.0f});
+			CHECK(vertices[7].Normal == v3f{-1.0f, 0.0f, -0.0f});
+			CHECK(vertices[22].Normal == v3f{0.0f, 0.0f, 1.0f});
+		}
+		{
+			REQUIRE(sm.getMesh()->getMeshBuffer(2)->getVertexCount() == 24);
+			auto vertices = static_cast<const irr::video::S3DVertex *>(
+				sm.getMesh()->getMeshBuffer(2)->getVertices());
+			CHECK(vertices[3].Normal == v3f{1.0f, 0.0f, -0.0f});
+			CHECK(vertices[4].Normal == v3f{-1.0f, 0.0f, -0.0f});
+			CHECK(vertices[5].Normal == v3f{-1.0f, 0.0f, -0.0f});
+			CHECK(vertices[10].Normal == v3f{0.0f, 1.0f, -0.0f});
+			CHECK(vertices[11].Normal == v3f{0.0f, 1.0f, -0.0f});
+			CHECK(vertices[19].Normal == v3f{0.0f, 0.0f, -1.0f});
+		}
 	}
 
 	
 	SECTION("texture coords are correct for all buffers") {
-		REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24);
-		irr::video::S3DVertex vertices[24];
-		std::memcpy(vertices, sm.getMesh()->getMeshBuffer(0)->getVertices(),
-			24 * sizeof(irr::video::S3DVertex));
+		{
+			REQUIRE(sm.getMesh()->getMeshBuffer(0)->getVertexCount() == 24);
+			auto vertices = static_cast<const irr::video::S3DVertex *>(
+					sm.getMesh()->getMeshBuffer(0)->getVertices());
+			CHECK(vertices[0].TCoords == v2f{0.583333313f, 0.791666686f});
+			CHECK(vertices[1].TCoords == v2f{0.583333313f, 0.666666686f});
+			CHECK(vertices[2].TCoords == v2f{0.708333313f, 0.791666686f});
+			CHECK(vertices[5].TCoords == v2f{0.375f, 0.416666657f});
+			CHECK(vertices[6].TCoords == v2f{0.5f, 0.291666657f});
+			CHECK(vertices[19].TCoords == v2f{0.708333313f, 0.75f});
+		}
+		{
+			REQUIRE(sm.getMesh()->getMeshBuffer(1)->getVertexCount() == 24);
+			auto vertices = static_cast<const irr::video::S3DVertex *>(
+					sm.getMesh()->getMeshBuffer(1)->getVertices());
 
-		INFO("coords should be " << vertices[0].TCoords.X << ' ' << vertices[0].TCoords.Y);
-		CHECK(vertices[0].TCoords == irr::core::vector2df{0.583333313f, 0.791666686f});
-		CHECK(vertices[1].TCoords == irr::core::vector2df{0.583333313f, 0.666666686f});
-		CHECK(vertices[2].TCoords == irr::core::vector2df{0.708333313f, 0.791666686f});
-		CHECK(vertices[5].TCoords == irr::core::vector2df{0.375f, 0.416666657f});
-		CHECK(vertices[6].TCoords == irr::core::vector2df{0.5f, 0.291666657f});
-		CHECK(vertices[19].TCoords == irr::core::vector2df{0.708333313f, 0.75f});
-
-		REQUIRE(sm.getMesh()->getMeshBuffer(1)->getVertexCount() == 24);
-		std::memcpy(vertices, sm.getMesh()->getMeshBuffer(1)->getVertices(),
-			24 * sizeof(irr::video::S3DVertex));
-
-		CHECK(vertices[1].TCoords == irr::core::vector2df{0.0f, 0.791666686f});
-		CHECK(vertices[4].TCoords == irr::core::vector2df{0.208333328f, 0.791666686f});
-		CHECK(vertices[5].TCoords == irr::core::vector2df{0.0f, 0.791666686f});
-		CHECK(vertices[6].TCoords == irr::core::vector2df{0.208333328f, 0.583333313f});
-		CHECK(vertices[12].TCoords == irr::core::vector2df{0.416666657f, 0.791666686f});
-		CHECK(vertices[15].TCoords == irr::core::vector2df{0.208333328f, 0.583333313f});
-
-		REQUIRE(sm.getMesh()->getMeshBuffer(2)->getVertexCount() == 24);
-		std::memcpy(vertices, sm.getMesh()->getMeshBuffer(2)->getVertices(),
-			24 * sizeof(irr::video::S3DVertex));
-
-		CHECK(vertices[10].TCoords == irr::core::vector2df{0.375f, 0.416666657f});
-		CHECK(vertices[11].TCoords == irr::core::vector2df{0.375f, 0.583333313f});
-		CHECK(vertices[12].TCoords == irr::core::vector2df{0.708333313f, 0.625f});
-		CHECK(vertices[17].TCoords == irr::core::vector2df{0.541666687f, 0.458333343f});
-		CHECK(vertices[20].TCoords == irr::core::vector2df{0.208333328f, 0.416666657f});
-		CHECK(vertices[22].TCoords == irr::core::vector2df{0.375f, 0.416666657f});
+			CHECK(vertices[1].TCoords == v2f{0.0f, 0.791666686f});
+			CHECK(vertices[4].TCoords == v2f{0.208333328f, 0.791666686f});
+			CHECK(vertices[5].TCoords == v2f{0.0f, 0.791666686f});
+			CHECK(vertices[6].TCoords == v2f{0.208333328f, 0.583333313f});
+			CHECK(vertices[12].TCoords == v2f{0.416666657f, 0.791666686f});
+			CHECK(vertices[15].TCoords == v2f{0.208333328f, 0.583333313f});
+		}
+		{
+			REQUIRE(sm.getMesh()->getMeshBuffer(2)->getVertexCount() == 24);
+			auto vertices = static_cast<const irr::video::S3DVertex *>(
+					sm.getMesh()->getMeshBuffer(2)->getVertices());
+			CHECK(vertices[10].TCoords == v2f{0.375f, 0.416666657f});
+			CHECK(vertices[11].TCoords == v2f{0.375f, 0.583333313f});
+			CHECK(vertices[12].TCoords == v2f{0.708333313f, 0.625f});
+			CHECK(vertices[17].TCoords == v2f{0.541666687f, 0.458333343f});
+			CHECK(vertices[20].TCoords == v2f{0.208333328f, 0.416666657f});
+			CHECK(vertices[22].TCoords == v2f{0.375f, 0.416666657f});
+		}
 	}
 }