Modified test files to work with our individual class.  Also changed
hawkOnFireOS to be ready to evolve fire power.