Spruced up unit tests

Signed-off-by: geoffsdavis <geoffsdavis@yahoo.com>