diff --git a/test/initmain.c b/test/initmain.c
index e6e83388..c741bcd9 100644
--- a/test/initmain.c
+++ b/test/initmain.c
@@ -4,44 +4,98 @@
 
 // TODO test the number of calls to queued functions made
 
-#define errInvalidOptions "options parameter to uiInit() must be NULL"
-#define errAlreadyInitialized "libui already initialized"
-
-TestNoInit(Init)
+TestNoInit(InitWithNonNullOptionsIsProgrammerError)
 {
-	uiInitError err;
+	void *ctx;
 
+	ctx = beginCheckProgrammerError("uiInit(): invalid uiInitOptions passed");
+	if (uiInit(ctx, NULL))
+		TestErrorf("uiInit() with non-NULL options succeeded; expected failure");
+	endCheckProgrammerError(ctx);
+}
+
+TestNoInit(InitWithNullErrorIsProgrammerError)
+{
+	void *ctx;
+
+	ctx = beginCheckProgrammerError("uiInit(): invalid null pointer for uiInitError");
 	if (uiInit(NULL, NULL))
 		TestErrorf("uiInit() with NULL error succeeded; expected failure");
+	endCheckProgrammerError(ctx);
+}
 
+TestNoInit(InitWithWrongErrorSizeIsProgrammerError)
+{
+	uiInitError err;
+	void *ctx;
+
+	ctx = beginCheckProgrammerError("uiInit(): wrong size 2 for uiInitError");
 	memset(&err, 0, sizeof (uiInitError));
-
 	err.Size = 2;
 	if (uiInit(NULL, &err))
 		TestErrorf("uiInit() with error with invalid size succeeded; expected failure");
-
-	err.Size = sizeof (uiInitError);
-
-	if (uiInit(&err, &err))
-		TestErrorf("uiInit() with non-NULL options succeeded; expected failure");
-	if (strcmp(err.Message, errInvalidOptions) != 0)
-		TestErrorf("uiInit() with non-NULL options returned bad error message:" diff("%s"),
-			err.Message, errInvalidOptions);
+	endCheckProgrammerError(ctx);
 }
 
-Test(InitAfterInitialized)
+Test(InitCorrectlyAfterInitializedSuccessfully)
 {
 	uiInitError err;
+	void *ctx;
 
+	ctx = beginCheckProgrammerError("uiInit(): attempt to call more than once");
 	memset(&err, 0, sizeof (uiInitError));
 	err.Size = sizeof (uiInitError);
 	if (uiInit(NULL, &err))
-		TestErrorf("uiInit() after a previous successful call succeeded; expected failure");
-	if (strcmp(err.Message, errAlreadyInitialized) != 0)
-		TestErrorf("uiInit() after a previous successful call returned bad error message:" diff("%s"),
-			err.Message, errAlreadyInitialized);
+		TestFatalf("uiInit() after a previous successful call succeeded; expected failure");
+	endCheckProgrammerError(ctx);
 }
 
+Test(InitIncorrectlyAfterInitializedSuccessfully)
+{
+	void *ctx;
+
+	ctx = beginCheckProgrammerError("uiInit(): attempt to call more than once");
+	if (uiInit(NULL, NULL))
+		TestFatalf("bad uiInit() after a previous successful call succeeded; expected failure");
+	endCheckProgrammerError(ctx);
+}
+
+// TODO TestNoInit(InitCorrectlyAfterFailureToInitailize)
+// TODO TestNoInit(InitIncorrectlyAfterFailureToInitialize)
+
+TestNoInit(InitCorrectlyAfterIncorrectInitialization)
+{
+	uiInitError err;
+	void *ctx;
+
+	ctx = beginCheckProgrammerError("uiInit(): invalid uiInitOptions passed");
+	if (uiInit(ctx, NULL))
+		TestErrorf("uiInit() with non-NULL options succeeded; expected failure");
+	endCheckProgrammerError(ctx);
+	ctx = beginCheckProgrammerError("uiInit(): attempt to call more than once");
+	memset(&err, 0, sizeof (uiInitError));
+	err.Size = sizeof (uiInitError);
+	if (uiInit(NULL, &err))
+		TestFatalf("uiInit() after a previous successful call succeeded; expected failure");
+	endCheckProgrammerError(ctx);
+}
+
+TestNoInit(InitIncorrectlyAfterIncorrectInitialization)
+{
+	void *ctx;
+
+	ctx = beginCheckProgrammerError("uiInit(): invalid uiInitOptions passed");
+	if (uiInit(ctx, NULL))
+		TestErrorf("uiInit() with non-NULL options succeeded; expected failure");
+	endCheckProgrammerError(ctx);
+	ctx = beginCheckProgrammerError("uiInit(): attempt to call more than once");
+	if (uiInit(NULL, NULL))
+		TestFatalf("bad uiInit() after a previous successful call succeeded; expected failure");
+	endCheckProgrammerError(ctx);
+}
+
+// TODOTODOTODOTODOTODOTODOTODOTODOTODOTODO
+
 struct testParams {
 	uint32_t flag;
 	threadSysError err;
diff --git a/test/test.h b/test/test.h
index 16b8f235..075d3990 100644
--- a/test/test.h
+++ b/test/test.h
@@ -80,7 +80,7 @@ sharedbitsPrintfFunc(
 // errors.c
 extern void *beginCheckProgrammerError(const char *want);
 extern void endCheckProgrammerErrorFull(const char *file, long line, void *context);
-#define endCheckProgrammerError(context) checkProgrammerErrorFull(__FILE__, __LINE__, context)
+#define endCheckProgrammerError(context) endCheckProgrammerErrorFull(__FILE__, __LINE__, context)
 
 #ifdef __cplusplus
 }