fix
fix tests
update docs