Update specs with lots of test cases

The C\d{4} numbers are for our internal test tracking.