More tests.

Some still work in progress, so they are commented out.