Fixed error in lamda
Better testing