Tests

Squashed commit of the following:

commit 01a891d477223be8b4515cd3240689687e91b0e3
Author: Ian Shafer <ian@yabbly.com>
Date:   Tue Jul 22 08:36:39 2014 -0700

    wip

commit b8ff86a6c9d7aa25cd684438f21d62e5fb53d64b
Author: Ian Shafer <ian@yabbly.com>
Date:   Mon Jul 21 17:09:41 2014 -0700

    wip