Added test message and simplified.