diff --git a/darwin/control.m b/darwin/control.m
index c720a680..51724e14 100644
--- a/darwin/control.m
+++ b/darwin/control.m
@@ -3,8 +3,8 @@
 
 bool uiprivOSVtableValid(uiControlOSVtable *osVtable, const char *func)
 {
-	if (vtable->Size != sizeof (uiControlOSVtable)) {
-		uiprivProgrammerErrorWrongStructSize(vtable->Size, "uiControlOSVtable", func);
+	if (osVtable->Size != sizeof (uiControlOSVtable)) {
+		uiprivProgrammerErrorWrongStructSize(osVtable->Size, "uiControlOSVtable", func);
 		return false;
 	}
 	return true;
diff --git a/test/controls.c b/test/controls.c
index 418ff551..0dca0f65 100644
--- a/test/controls.c
+++ b/test/controls.c
@@ -17,17 +17,12 @@ static void testVtableFree(uiControl *c, void *implData)
 	// do nothing
 }
 
-static void testVtableTestMethod(uiControl *c, void *implData)
-{
-	// do nothing
-}
-
 static void createTestVtable(uiControlVtable *vtable)
 {
-	memset(&vtable, 0, sizeof (uiControlVtable));
-	vtable.Size = sizeof (uiControlVtable);
-	vtable.Init = testVtableInit;
-	vtable.Free = testVtableFree;
+	memset(vtable, 0, sizeof (uiControlVtable));
+	vtable->Size = sizeof (uiControlVtable);
+	vtable->Init = testVtableInit;
+	vtable->Free = testVtableFree;
 }
 
 struct checkControlErrorsParams {
@@ -35,7 +30,7 @@ struct checkControlErrorsParams {
 	uiControlVtable *vtablePlaceholder;
 	uiControlOSVtable *osVtablePlaceholder;
 	size_t implDataSizePlaceholder;
-	uiControlVtable *badSizeVtable;
+	uiControlVtable *vtableBadSize;
 };
 
 // TODO clean up these macros
@@ -43,7 +38,7 @@ struct checkControlErrorsParams {
 #define checkErrorCaseFull(line, call, msgWant) \
 	static void checkCat(doCheck, line)(void *data) \
 	{ \
-		struct checkEventErrorsParams *p = (struct checkEventErrorsParams *) data; \
+		struct checkControlErrorsParams *p = (struct checkControlErrorsParams *) data; \
 		(void) p; /* in the event call does not use this */ \
 		call; \
 	}
@@ -59,7 +54,7 @@ static const struct {
 } controlErrorCases[] = {
 #define checkErrorCaseFull(line, callstr, msgWant) { callstr, checkCat(doCheck, line), msgWant },
 #define checkErrorCase(call, msgWant) checkErrorCaseFull(__LINE__, #call, msgWant)
-#include "events_errors.h"
+#include "controls_errors.h"
 #undef checkErrorCase
 #undef checkErrorCaseFull
 #undef checkCat
@@ -69,14 +64,19 @@ static const struct {
 testingTest(ControlErrors)
 {
 	struct checkControlErrorsParams p;
+	uiControlVtable vtable;
+	uiControlVtable vtableBadSize;
 	size_t i;
 
 	memset(&p, 0, sizeof (struct checkControlErrorsParams));
 	p.namePlaceholder = "name";
-	createTestVtable(&p.vtablePlaceholder);
+	createTestVtable(&vtable);
+	p.vtablePlaceholder = &vtable;
 	// TODO osVtablePlaceholder
 	p.implDataSizePlaceholder = sizeof (struct testImplData);
-	p.badSizeVtable.Size = 1;
+	memset(&vtableBadSize, 0, sizeof (uiControlVtable));
+	vtableBadSize.Size = 1;
+	p.vtableBadSize = &vtableBadSize;
 
 	for (i = 0; controlErrorCases[i].name != NULL; i++)
 		checkProgrammerError(t, controlErrorCases[i].name, controlErrorCases[i].f, &p, controlErrorCases[i].msgWant);
diff --git a/test/controls_errors.h b/test/controls_errors.h
index 4c9c010d..5bed56a7 100644
--- a/test/controls_errors.h
+++ b/test/controls_errors.h
@@ -4,9 +4,9 @@ checkErrorCase(uiRegisterControlType(NULL, p->vtablePlaceholder, p->osVtablePlac
 	"TODO")
 checkErrorCase(uiRegisterControlType(p->namePlaceholder, NULL, p->osVtablePlaceholder, p->implDataSizePlaceholder),
 	"TODO")
-checkErrorCase(uiRegisterControlType(p->namePlaceholder, p->badVtableSize, p->osVtablePlaceholder, p->implDataSizePlaceholder),
-	"TODO");
+checkErrorCase(uiRegisterControlType(p->namePlaceholder, p->vtableBadSize, p->osVtablePlaceholder, p->implDataSizePlaceholder),
+	"TODO")
 // TODO individual methods
 checkErrorCase(uiRegisterControlType(p->namePlaceholder, p->vtablePlaceholder, NULL, p->implDataSizePlaceholder),
-	"TODO");
+	"TODO")
 // OS vtable sizes are tested per-OS