Second recovery of unit tests

Second recovery of unit tests