Small changes to improve tests.

Signed-off-by: Eduardo Tenorio <embatbr@gmail.com>