More Test coverage and a minor "use" fix.