Refactor scoping test files

check commit message/description for what i've done :smile: