Add new small features for unit testings