Added some unit tests commented out tests that were failing.

Change-Id: If2d5e4ea57bf5b13e18715bd36ba5bc06b382903
Reviewed-on: http://www.matthewh.me/gerrit/6
Reviewed-by: Matthew Hoggan <matthew.hoggan@matthewh.me>
Tested-by: Matthew Hoggan <matthew.hoggan@matthewh.me>