Fixed dependencies problems and tweak on test

Signed-off-by: Gabriel Herrera <jogah.cr@gmail.com>