test_model.py: update to import from new dir structure.
test_parfile.py: update to use new import syntax.