Add STI testing
Merge pull request #164 from danmcp/master

Add STI testing