Fixed tests that weren't changed over to use Scope property