More tests...coverage is now 94%!