Test moved outside of if(manual)