Updated to fix testing procedure