Issue #87, minor improvement to message parser regex legibility
Issue #87, removed obsolete testing features