Merge "add test def for calculator" into gingerbread