Tests!

Signed-off-by: Steven Hoffman <git@fustrate.com>
Testing finds errors, so I fix errors

Signed-off-by: Steven Hoffman <git@fustrate.com>