Refs #7831 - Adds test support
Merge pull request #89 from adamruzicka/add_tests

Refs #7831 - Adds test support