Fix annotation testing could be interrupted

[LemonCaramel]

comment

Also, the issue of failing tests in nested classes has been resolved.

[kennytv]

~~Not sure if nullmarked actually applies to inner classes, those might be valid fails~~ never mind