WIP commit of some tests and a bit more text