Separated tests, added tests around scope