[244] Rearrange all the tests into better groups

This also orders them to match their apperance in the spec.

Author: ssilverman