- Refactor specs
- Add realistic test values