Fan testing implemented
A couple of other changes