Moving tests from defunct PR into new branch