Minor improvements.
Updated tests.
Moved hardcoded messages to en_us.json.