Added unit tests
Merge pull request #2 from yata-yata/use-orchestrate

Added unit tests