more tests
better logs