diff --git a/ChangeLog b/ChangeLog
index cdd9b23a..6eb70bdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -84,7 +84,9 @@ Changes since Node.js v0.11.0:
 * build: gyp disable thin archives (Timothy J. Fontaine)
 
 * build: add support for Visual Studio 2012 (Nicholas Vavilov)
-2013.02.04, Version 0.10.3 (Stable), 31ebe23973dd98fd8a24c042b606f37a794e99d0
+
+
+2013.03.28, Version 0.10.3 (Stable), 31ebe23973dd98fd8a24c042b606f37a794e99d0
 
 Changes since version 0.10.2:
 
diff --git a/config-unix.mk b/config-unix.mk
index adbee4f4..3cecb57b 100644
--- a/config-unix.mk
+++ b/config-unix.mk
@@ -18,8 +18,6 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-OBJC ?= $(CC)
-
 E=
 CSTDFLAG=--std=c89 -pedantic -Wall -Wextra -Wno-unused-parameter
 CFLAGS += -g
@@ -178,9 +176,6 @@ test/%.o: test/%.c include/uv.h test/.buildstamp
 clean-platform:
 	$(RM) test/run-{tests,benchmarks}.dSYM $(OBJS) $(OBJS:%.o=%.pic.o) src/unix/uv-dtrace.h
 
-%.pic.o %.o:  %.m
-	$(OBJC) $(CPPFLAGS) $(CFLAGS) -c $^ -o $@
-
 src/unix/uv-dtrace.h: src/unix/uv-dtrace.d
 	dtrace -h -xnolibs -s $< -o $@
 
diff --git a/src/unix/darwin-proctitle.m b/src/unix/darwin-proctitle.c
similarity index 93%
rename from src/unix/darwin-proctitle.m
rename to src/unix/darwin-proctitle.c
index d0ee95b4..e6c85905 100644
--- a/src/unix/darwin-proctitle.m
+++ b/src/unix/darwin-proctitle.c
@@ -18,7 +18,8 @@
  * IN THE SOFTWARE.
  */
 
-#include <Cocoa/Cocoa.h>
+#include <CoreFoundation/CoreFoundation.h>
+#include <ApplicationServices/ApplicationServices.h>
 
 
 int uv__set_process_title(const char* title) {
@@ -43,14 +44,14 @@ int uv__set_process_title(const char* title) {
   if (launch_services_bundle == NULL)
     return -1;
 
-  ls_get_current_application_asn =
+  ls_get_current_application_asn = (LSGetCurrentApplicationASNType)
       CFBundleGetFunctionPointerForName(launch_services_bundle,
                                         CFSTR("_LSGetCurrentApplicationASN"));
 
   if (ls_get_current_application_asn == NULL)
     return -1;
 
-  ls_set_application_information_item =
+  ls_set_application_information_item = (LSSetApplicationInformationItemType)
       CFBundleGetFunctionPointerForName(launch_services_bundle,
                                         CFSTR("_LSSetApplicationInformationItem"));
 
diff --git a/test/runner-unix.c b/test/runner-unix.c
index eefb7008..b66df51b 100644
--- a/test/runner-unix.c
+++ b/test/runner-unix.c
@@ -286,6 +286,34 @@ int process_copy_output(process_info_t *p, int fd) {
 }
 
 
+/* Copy the last line of the stdio output buffer to `buffer` */
+int process_read_last_line(process_info_t *p,
+                           char* buffer,
+                           size_t buffer_len) {
+  char* ptr;
+
+  int r = fseek(p->stdout_file, 0, SEEK_SET);
+  if (r < 0) {
+    perror("fseek");
+    return -1;
+  }
+
+  buffer[0] = '\0';
+
+  while (fgets(buffer, buffer_len, p->stdout_file) != NULL) {
+    for (ptr = buffer; *ptr && *ptr != '\r' && *ptr != '\n'; ptr++);
+    *ptr = '\0';
+  }
+
+  if (ferror(p->stdout_file)) {
+    perror("read");
+    buffer[0] = '\0';
+    return -1;
+  }
+  return 0;
+}
+
+
 /* Return the name that was specified when `p` was started by process_start */
 char* process_get_name(process_info_t *p) {
   return p->name;
diff --git a/test/runner-win.c b/test/runner-win.c
index 3aae1c3e..5d232594 100644
--- a/test/runner-win.c
+++ b/test/runner-win.c
@@ -248,6 +248,46 @@ int process_copy_output(process_info_t *p, int fd) {
 }
 
 
+int process_read_last_line(process_info_t *p,
+                           char * buffer,
+                           size_t buffer_len) {
+  DWORD size;
+  DWORD read;
+  DWORD start;
+  OVERLAPPED overlapped;
+
+  ASSERT(buffer_len > 0);
+
+  size = GetFileSize(p->stdio_out, NULL);
+  if (size == INVALID_FILE_SIZE)
+    return -1;
+
+  if (size == 0) {
+    buffer[0] = '\0';
+    return 1;
+  }
+
+  memset(&overlapped, 0, sizeof overlapped);
+  if (size >= buffer_len)
+    overlapped.Offset = size - buffer_len - 1;
+
+  if (!ReadFile(p->stdio_out, buffer, buffer_len - 1, &read, &overlapped))
+    return -1;
+
+  for (start = read - 1; start >= 0; start--) {
+    if (buffer[start] == '\n' || buffer[start] == '\r')
+      break;
+  }
+
+  if (start > 0)
+    memmove(buffer, buffer + start, read - start);
+
+  buffer[read - start] = '\0';
+
+  return 0;
+}
+
+
 char* process_get_name(process_info_t *p) {
   return p->name;
 }
diff --git a/test/runner.c b/test/runner.c
index bda1080a..d8e9ddeb 100644
--- a/test/runner.c
+++ b/test/runner.c
@@ -31,12 +31,25 @@ char executable_path[PATHMAX] = { '\0' };
 int tap_output = 0;
 
 
-static void log_progress(int total, int passed, int failed, const char* name) {
+static void log_progress(int total,
+                         int passed,
+                         int failed,
+                         int todos,
+                         int skipped,
+                         const char* name) {
+  int progress;
+
   if (total == 0)
     total = 1;
 
-  LOGF("[%% %3d|+ %3d|- %3d]: %s", (int) ((passed + failed) / ((double) total) * 100.0),
-      passed, failed, name);
+  progress = 100 * (passed + failed + skipped + todos) / total;
+  LOGF("[%% %3d|+ %3d|- %3d|T %3d|S %3d]: %s",
+       progress,
+       passed,
+       failed,
+       todos,
+       skipped,
+       name);
 }
 
 
@@ -78,7 +91,13 @@ const char* fmt(double d) {
 
 
 int run_tests(int timeout, int benchmark_output) {
-  int total, passed, failed, current;
+  int total;
+  int passed;
+  int failed;
+  int todos;
+  int skipped;
+  int current;
+  int test_result;
   task_entry_t* task;
 
   /* Count the number of tests. */
@@ -96,6 +115,8 @@ int run_tests(int timeout, int benchmark_output) {
   /* Run all tests. */
   passed = 0;
   failed = 0;
+  todos = 0;
+  skipped = 0;
   current = 1;
   for (task = TASKS; task->main; task++) {
     if (task->is_helper) {
@@ -106,13 +127,15 @@ int run_tests(int timeout, int benchmark_output) {
       rewind_cursor();
 
     if (!benchmark_output && !tap_output) {
-      log_progress(total, passed, failed, task->task_name);
+      log_progress(total, passed, failed, todos, skipped, task->task_name);
     }
 
-    if (run_test(task->task_name, timeout, benchmark_output, current) == 0) {
-      passed++;
-    } else {
-      failed++;
+    test_result = run_test(task->task_name, timeout, benchmark_output, current);
+    switch (test_result) {
+    case TEST_OK: passed++; break;
+    case TEST_TODO: todos++; break;
+    case TEST_SKIP: skipped++; break;
+    default: failed++;
     }
     current++;
   }
@@ -121,13 +144,50 @@ int run_tests(int timeout, int benchmark_output) {
     rewind_cursor();
 
   if (!benchmark_output && !tap_output) {
-    log_progress(total, passed, failed, "Done.\n");
+    log_progress(total, passed, failed, todos, skipped, "Done.\n");
   }
 
   return failed;
 }
 
 
+void log_tap_result(int test_count,
+                    const char* test,
+                    int status,
+                    process_info_t* process) {
+  const char* result;
+  const char* directive;
+  char reason[1024];
+
+  switch (status) {
+  case TEST_OK:
+    result = "ok";
+    directive = "";
+    break;
+  case TEST_TODO:
+    result = "not ok";
+    directive = " # TODO ";
+    break;
+  case TEST_SKIP:
+    result = "ok";
+    directive = " # SKIP ";
+    break;
+  default:
+    result = "not ok";
+    directive = "";
+  }
+
+  if ((status == TEST_SKIP || status == TEST_TODO) &&
+      process_output_size(process) > 0) {
+    process_read_last_line(process, reason, sizeof reason);
+  } else {
+    reason[0] = '\0';
+  }
+
+  LOGF("%s %d - %s%s%s\n", result, test_count, test, directive, reason);
+}
+
+
 int run_test(const char* test,
              int timeout,
              int benchmark_output,
@@ -231,7 +291,7 @@ int run_test(const char* test,
   }
 
   status = process_reap(main_proc);
-  if (status != 0) {
+  if (status != TEST_OK) {
     snprintf(errmsg,
              sizeof errmsg,
              "exit code %d",
@@ -255,17 +315,17 @@ out:
     FATAL("process_wait failed");
   }
 
-  if (tap_output) {
-    if (status == 0)
-      LOGF("ok %d - %s\n", test_count, test);
-    else
-      LOGF("not ok %d - %s\n", test_count, test);
-  }
+  if (tap_output)
+    log_tap_result(test_count, test, status, &processes[i]);
 
   /* Show error and output from processes if the test failed. */
   if (status != 0 || task->show_output) {
     if (tap_output) {
       LOGF("#");
+    } else if (status == TEST_TODO) {
+      LOGF("\n`%s` todo\n", test);
+    } else if (status == TEST_SKIP) {
+      LOGF("\n`%s` skipped\n", test);
     } else if (status != 0) {
       LOGF("\n`%s` failed: %s\n", test, errmsg);
     } else {
diff --git a/test/runner.h b/test/runner.h
index 8be9e39f..aa7f2054 100644
--- a/test/runner.h
+++ b/test/runner.h
@@ -143,6 +143,11 @@ long int process_output_size(process_info_t *p);
 /* Copy the contents of the stdio output buffer to `fd`. */
 int process_copy_output(process_info_t *p, int fd);
 
+/* Copy the last line of the stdio output buffer to `buffer` */
+int process_read_last_line(process_info_t *p,
+                           char * buffer,
+                           size_t buffer_len);
+
 /* Return the name that was specified when `p` was started by process_start */
 char* process_get_name(process_info_t *p);
 
diff --git a/test/task.h b/test/task.h
index de7c80ec..308201e5 100644
--- a/test/task.h
+++ b/test/task.h
@@ -119,4 +119,28 @@ void uv_sleep(int msec);
 /* Format big numbers nicely. WARNING: leaks memory. */
 const char* fmt(double d);
 
+/* Reserved test exit codes. */
+enum test_status {
+  TEST_OK = 0,
+  TEST_TODO,
+  TEST_SKIP
+};
+
+#define RETURN_OK()                                                           \
+  do {                                                                        \
+    return TEST_OK;                                                           \
+  } while (0)
+
+#define RETURN_TODO(explanation)                                              \
+  do {                                                                        \
+    LOGF("%s\n", explanation);                                                \
+    return TEST_TODO;                                                         \
+  } while (0)
+
+#define RETURN_SKIP(explanation)                                              \
+  do {                                                                        \
+    LOGF("%s\n", explanation);                                                \
+    return TEST_SKIP;                                                         \
+  } while (0)
+
 #endif /* TASK_H_ */
diff --git a/uv.gyp b/uv.gyp
index 7fab2a3d..f2cdd538 100644
--- a/uv.gyp
+++ b/uv.gyp
@@ -177,7 +177,7 @@
           'sources': [
             'src/unix/darwin.c',
             'src/unix/fsevents.c',
-            'src/unix/darwin-proctitle.m',
+            'src/unix/darwin-proctitle.c',
           ],
           'link_settings': {
             'libraries': [