Add tests. Reorganize tests.
Add more tests: nesting. Clean up tests a bit.