Minor cleanup to logic and testsuite.

Signed-off-by: Robert Xu <robxu9@gmail.com>