more csw tests. pretty good coverage at this point