Make sure that all non-positive cases are handled.
Added raw descriptions to TODO.