Add tests and display slightly more info