Fixing #32

- Fixing #32
- Updating tests
- Ensuring clean lint