Update wording of test-case
Fix test timing issue
Merge captureMessage with captureError
Add TODO