Improved: text formatting.
Dropped use of catalog in test to lower computing time.