test messages refactored