diff --git a/app/EntityPersisters/BasePersister.php b/app/EntityPersisters/BasePersister.php
index b33fea15..d69fd450 100644
--- a/app/EntityPersisters/BasePersister.php
+++ b/app/EntityPersisters/BasePersister.php
@@ -12,6 +12,7 @@
  * limitations under the License.
  **/
 use LaravelDoctrine\ORM\Facades\Registry;
+use models\utils\SilverstripeBaseModel;
 /**
  * Class BasePersister
  * @package App\EntityPersisters
@@ -23,7 +24,7 @@ abstract class BasePersister
      * @param array $bindings
      */
     protected static function insert($sql, array $bindings, array $types){
-        $em = Registry::getManager('ss');
+        $em = Registry::getManager(SilverstripeBaseModel::EntityManager);
         $em->getConnection()->executeUpdate($sql, $bindings, $types);
     }
 }
\ No newline at end of file
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 741b5ac4..35f79cbd 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -72,9 +72,11 @@ final class EventServiceProvider extends ServiceProvider
         });
 
         Event::listen(\Illuminate\Mail\Events\MessageSending::class, function($event){
-            if(App::environment() === 'dev' || App::environment() === 'testing' ){
-                $event->message->setTo(env('DEV_EMAIL_TO'));
+            $devEmail = env('DEV_EMAIL_TO');
+            if((App::environment() === 'dev' || App::environment() === 'testing') && !empty($devEmail)){
+                $event->message->setTo(explode(",", $devEmail));
             }
+            return true;
         });
 
         Event::listen(\App\Events\MyFavoritesAdd::class, function($event)
diff --git a/tests/DoctrineTest.php b/tests/DoctrineTest.php
index 0d410aa9..eaf0ce22 100644
--- a/tests/DoctrineTest.php
+++ b/tests/DoctrineTest.php
@@ -66,7 +66,7 @@ final class DoctrineTest extends TestCase
     }
 
     public function testGetMember(){
-        $em = Registry::getManager('ss');
+        $em = Registry::getManager(SilverstripeBaseModel::EntityManager);
         $repo   =  $em->getRepository(\models\main\Member::class);
         $me = $repo->find(11624);
         $this->assertTrue(!is_null($me));
@@ -84,7 +84,7 @@ final class DoctrineTest extends TestCase
     }
 
     public function testGetFile(){
-        $em = Registry::getManager('ss');
+        $em = Registry::getManager(SilverstripeBaseModel::EntityManager);
         $repo   =  $em->getRepository(\models\main\File::class);
         $file = $repo->find(1);
         $this->assertTrue(!is_null($file));
@@ -98,7 +98,7 @@ final class DoctrineTest extends TestCase
         $newExternalLocation->setType(SummitExternalLocation::Lounge);
         $newExternalLocation->setSummit($summit);
         $summit->getLocations()->add($newExternalLocation);
-        $em = Registry::getManager('ss');
+        $em = Registry::getManager(SilverstripeBaseModel::EntityManager);
         $em->flush();
     }