refactored tests
refactored scoped_methods. Added a few more