Fixing bad base class for test
Fixing test by using new Bundle object
Fixing bad indentation (caught by tests!)
Fixing another test now that the Bundle object is being passed