Put test classes into own files.
Change imports.