LL fixes + tests