Copying over more test parts