SLI Fixes

Fixes #4

- [x] Missing uses
- [x] Code duplication
- [x] Unused uses
- [x] Unit Testing support
- [ ] @ todo's
- [ ] Unused methods/parameters/variables