Made review changes:
- removed pointless tests
- Removed pointless config
- Refactored to send configs as parameters