cs, more tests and todo for readme