Fixes & tests around /cs/* handlers.