- Adapted tests
- Removed commented-out code