Merge pull request #1 from erkim/master

Merge into asr716
Added a couple of classes for testing purposes
Merge pull request #2 from asr716/master

Merge testing methods