Merge pull request #1 from slav/master

Pull request #1
updated tests to confirm shipped and new orders can be downloaded and merged
Merge pull request #2 from DmytroSV/master

updated tests