WIP - tests + logging