2011-06-15

- More tests.
- Better tests.