more tests, coverage at %57
%60 coverage