Add tests
Improve display