Reorganized some tests, added a few new tests.