Added test cases for more calculated attributes -- at least one test
case for each.  Reorganized test cases by category (although
categories are still split according to how the test is matched).