Moved several more tests.