Increasing test coverage

- Removed unused code
- Added more reasonably named fixtures for testing
- Added testing