WIP - add tests