Relocated some test classes into test packages.