Squashed commit of the following:

commit 061aee65e24b0d16ba952257f00a6b8307bd9103
Author: Abraham Heward <aheward@rsmart.com>
Date:   Fri Jun 20 11:45:15 2014 -0700

    Returned all tests to a runnable state.