Three more unit tests+ some changes in  previos ones.