Changes to Sonar Mock and Added DumpState