Corrected computation of lambdas
Tests now pass