improving csw test a bit... should work now and not break the way it did...

....