Move more scope tests into compile-testing style tests.