- Add more tests, 2nd pass at output messages