some more tweaks to unit testing system