Added proper test scope