more structured code
more structured tests
Towards a generic testing model...