Added tests.
Moved files.