diff --git a/src/pmc/pmcmatrix2d.pmc b/src/pmc/pmcmatrix2d.pmc
index cd8cc9e..e908510 100644
--- a/src/pmc/pmcmatrix2d.pmc
+++ b/src/pmc/pmcmatrix2d.pmc
@@ -708,7 +708,7 @@ Get a PMCMatrix2D from the current matrix
 
     METHOD convert_to_complex_matrix() {
         DECLATTRS(SELF, attrs);
-        PMC * const d = Parrot_pmc_new(INTERP, __PLA_Type_PMCMatrix2D);
+        PMC * const d = Parrot_pmc_new(INTERP, __PLA_Type_ComplexMatrix2D);
         const INTVAL totalsize = attrs->rows * attrs->cols;
         PMC * const meth = VTABLE_find_method(INTERP, d, CONST_STRING(INTERP, "resize"));
         INTVAL i;
diff --git a/t/pmc/complexmatrix2d.t b/t/pmc/complexmatrix2d.t
index 256b7c6..79f3074 100644
--- a/t/pmc/complexmatrix2d.t
+++ b/t/pmc/complexmatrix2d.t
@@ -193,6 +193,17 @@ method test_METHOD_gemm_aABbC() {
     my $Z := $A.'gemm'(self.complex("0.25"), $A, $B, self.complex("0.0"), $C);
 }
 
+# Test that we can call GEMM with alpha of various types
+method test_METHOD_gemm_ALPHA_TYPE() {
+    todo("Write this!");
+}
+
+# Test that we can call GEMM with beta of various types
+method test_METHOD_gemm_BETA_TYPE() {
+    todo("Write this!");
+}
+
+
 method test_METHOD_conjugate() {
     my $m := self.matrix2x2("1+1i", "2+2i", "3+3i", "4+4i");
     my $n := self.matrix2x2("1-1i", "2-2i", "3-3i", "4-4i");
diff --git a/t/testlib/numericmatrixtest.nqp b/t/testlib/numericmatrixtest.nqp
index 0e36c16..9f0dfe7 100644
--- a/t/testlib/numericmatrixtest.nqp
+++ b/t/testlib/numericmatrixtest.nqp
@@ -385,6 +385,18 @@ class Pla::Matrix::NumericMatrixTest is Pla::Matrix::MatrixTest {
         });
     }
 
+    method test_METHOD_gemm_AUTOCONVERT_A_NumMatrix2D() { todo("Write this!"); }
+    method test_METHOD_gemm_AUTOCONVERT_B_NumMatrix2D() { todo("Write this!"); }
+    method test_METHOD_gemm_AUTOCONVERT_C_NumMatrix2D() { todo("Write this!"); }
+
+    method test_METHOD_gemm_AUTOCONVERT_A_ComplexMatrix2D() { todo("Write this!"); }
+    method test_METHOD_gemm_AUTOCONVERT_B_ComplexMatrix2D() { todo("Write this!"); }
+    method test_METHOD_gemm_AUTOCONVERT_C_ComplexMatrix2D() { todo("Write this!"); }
+
+    method test_METHOD_gemm_AUTOCONVERT_A_PMCMatrix2D() { todo("Write this!"); }
+    method test_METHOD_gemm_AUTOCONVERT_B_PMCMatrix2D() { todo("Write this!"); }
+    method test_METHOD_gemm_AUTOCONVERT_C_PMCMatrix2D() { todo("Write this!"); }
+
     method test_METHOD_row_combine() {
         my $A := self.fancymatrix2x2();
         my $val1;