Test automation related content

As subject says... added a bit more granularity to the checks.
That sounds a little horrific ... I think it's fine if the calling class will appear in the stack trace.