Reworking tests to remove messages so they can be run on systems with memory limitations.