[WIP] Fixing more tests for kalibro client integration

Signed off by: Daniel Alves <danpaulalves@gmail.com>