- Improved code coverage of some classes

Signed-off-by: Jesús López Alonso <jeslopalo@sandbox.es>