More message and tests