Add some features to the unit tests