[#46] added scopes and tested them - working on previous tests
[45] adhered to comments - code is cleanerd