Refactor tests using Scope.
Merge pull request #97 from AI-comp/refactor_test

Refactor tests using Scope.