WIP
More unit tests