WIP add unit tests