restructure the sandbox
Refactoring towards a shared test suite