Merge pull request #3 from Mirantis/master

Update fork from upstream
Added tests for Scan.
Minor fixes in other tests.
Merge pull request #82 from yyekovenko/master

Added test for Scan operation.