Change first scope name. Add and use second scope. Improve tests.