Cleanup and some additional tests.

1 file changed