Revert changes to scope tests