general refactoring

Signed-off-by: Mauro Scomparin <scompo@gmail.com>
Ignored unimplemented test for CI..

Signed-off-by: Mauro Scomparin <scompo@gmail.com>