Moved and added tests.