Update specs with lots of test cases

The C\d{4} numbers are for our internal test tracking.
Merge pull request #97 from hunner/update_specs

Update specs with lots of test cases