few fixes + testing suit