fixes + unit testing