Imported files, added tests.