Clean up commented code
Add whenGET for verify call
Remove compass call in test
Remove extraneous span class
Get partial init function with tests