Fixed some remaining issues with LR

- Fixed final issues with LR
- Extended LR test cases