clean up

- added all test messages
- corrected items