Re-added test scope