some small code update in local

Signed-off-by: Pavel Svirida <pavel.svirida@jotautomation.com>
Windows - added some test code

Signed-off-by: Pavel Svirida <pavel.svirida@jotautomation.com>
Windows - commit local chagnges to merge with Ubuntu code

Signed-off-by: Pavel Svirida <pavel.svirida@jotautomation.com>