more test fixes
remove that again
Fixed l() calls.