added more unittests; not covering if __name__=='__main__' blocks