Tidier test framework.  More testing.