some fixes & tests
some fixes & tests v.2