Fixed some data issues, added improved mock Sensu data