Add a few unit tests