A few additions to tests for completeness...though some may be redundant but I think that's okay.