dyna: provide a more complete tests/__init__.py file
dyna: correct import
dyna: correct some tests to account for latest changes