Move some test packages around