change not_tested attribute to a magic comment
Fix merge conflicts
Merge branch 'jschaf-not-tested-comment'