[WIP] - a better structure for the tests (and the code)