Bugfix for Lambda_Valid test cases by separating the lambda and normal
functions.