Add unit tests
WIP