fixed hero test
Merge remote-tracking branch 'jreale4/master'
Removed warning errors.