From 90dad0311753aac1513a046bec63571a4f3b574d Mon Sep 17 00:00:00 2001
From: nathan <nathan@dorkbox.com>
Date: Fri, 17 Jul 2015 02:46:00 +0200
Subject: [PATCH] WIP cleanup/fix unit tests