tests improved
code fix
tests improved
CS fix.