- Improve tests according to the taxonomy
- Small improvements