Fixed imports in tests
Include doctests in runtests script