Added test support
Merge pull request #2 from danswater/dev

Added test support