Fixed unit tests and controllers that were failing

signed-off-by: Diego Araújo <diegoamc90@gmail.com>