reorganized tests, added scope tests