Fixed various test cases, unified inconclusive messages
Merge pull request #1258 from Benglin/TestCaseFixes

Fixed various test cases, unified inconclusive messages