scope test added where required, tests moved to appropriate dir path