Unit and func tests has been added part 2