Fix failing tests

Signed-off-by: Fernando Rocha <fernandogrd@gmail.com>