fixing lambdas
fixed tests