minor additions and fixes for cwas regression tests

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