Fixed tests; finished fixing line continuations with nested lambdas