better unittest, tweaks