cleaning up old testing code. 

Merge pull request mithunsatheesh#14 from heckj/cleanup code cleanup