test package structure matches code

[Jaapel]

Issue addressed

Fixes #976

Explanation

Explain how you addressed the bug/feature request, what choices you made and why.

General Checklist

• [x] Updated tests or added new tests
• [x] Branch is up to date with v1
• [x] Tests & pre-commit hooks pass
• [ ] Updated documentation
• [ ] Updated changelog.rst