Rewrote testing code.
Merged in finalization.
Merge pull request #219 from anubiann00b/merging

Merged finalization with squashed refactoring of test classes