Fix the current tests before adding more

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