TEST Refactor

Preparación del FW para integración de suite de tests.
Misc bugs.

Signed-off-by: Ram Ram <ramon@www.com.mx>