Enhanced testing code.

Signed-off-by: abbr <wenfred@gmail.com>