Moved some tests, added a new test.