Merge diagnostics
Merge pull request #3 from rishisharan/master

Add and edit test methods