Adding a couple of unit tests