more streamlining of cwas testing; additional test of regressors

Signed-off-by: Zarrar Shehzad <czarrar@gmail.com>