- Renamed classes
- Added tests