Added missing message to --errorlist output, changed Id to avoid duplicate
Refactorization: Moved code out of macro TEST_CASE