More test data. keyword/symbol improvements.