Improved functionality.
Preparing testing environment.

Signed-off-by: Paulo Pires <pjpires@ubiwhere.com>