Some more debugging
Some more debugging thanks to tests (finally...)