Add some new unit tests