Adds detailed recognition of different tests

Refs #9