added aoe type, adjusted test data parsing, continued testquestion ui and updated callisto & xaml-toolkit