Arranged (correlation=true, demean=false) case and added extensive testing