Fixed Unit Testing and cleaned controllers

Signed-off-by: Julien Bonvarlet <jbonva@gmail.com>