Improve message formatting and fn descriptions
Add some tests