Move tests into their respective packages.