Fix warnings (Xin Li)
Add test data for FIT map from Francis Irving (bug #358)