Test automation related content

As subject says... added a bit more granularity to the checks.
Yeah it was a nice thought but it doesnt seem to give much value so I will remove the exception wrap.