Moved error-message tests into a module+ in main source file.