Add error printout for missing case
Don't share above lambdas
Update test cases