Revamped the test file - fixes issue gh-1005

* Refactored out a bunch of logic in to reusable functions
* Added comments explaining some of the verification calls
* Formatted the changes and added myself as the author

Signed-off-by: Sauhard Sharma <[email protected]>

Author: Sauhardstark