more robust unittest import
code clean up