wip Add unit tests