Make test more comprehensive.  Remove debugging logs.