diff --git a/Framework/Particles/testParticles.cc b/Framework/Particles/testParticles.cc
index 1ca8b2188b5004c22c3168b5ad90290aa10a8ffb..0603ea03575cb7668bed8e3e276b5c81f60e27c3 100644
--- a/Framework/Particles/testParticles.cc
+++ b/Framework/Particles/testParticles.cc
@@ -50,11 +50,23 @@ TEST_CASE("ParticleProperties", "[Particles]") {
   }
 
   SECTION("PDG") {
-    REQUIRE(GetPDG(Code::PiPlus) == 211);
-    REQUIRE(GetPDG(Code::DPlus) == 411);
-    REQUIRE(GetPDG(Code::NuMu) == 14);
-    REQUIRE(GetPDG(Code::NuE) == 12);
-    REQUIRE(GetPDG(Code::MuMinus) == 13);
+    REQUIRE(GetPDG(Code::PiPlus) == PDGCode::PiPlus);
+    REQUIRE(GetPDG(Code::DPlus) == PDGCode::DPlus);
+    REQUIRE(GetPDG(Code::NuMu) == PDGCode::NuMu);
+    REQUIRE(GetPDG(Code::NuE) == PDGCode::NuE);
+    REQUIRE(GetPDG(Code::MuMinus) == PDGCode::MuMinus);
+      
+    REQUIRE(static_cast<int>(GetPDG(Code::PiPlus)) == 211);
+    REQUIRE(static_cast<int>(GetPDG(Code::DPlus)) == 411);
+    REQUIRE(static_cast<int>(GetPDG(Code::NuMu)) == 14);
+    REQUIRE(static_cast<int>(GetPDG(Code::NuEBar)) == -12);
+    REQUIRE(static_cast<int>(GetPDG(Code::MuMinus)) == 13);
+  }
+  
+  SECTION("Conversion PDG -> internal") {
+    REQUIRE(ConvertFromPDG(PDGCode::KStarMinus) == Code::KStarMinus);
+    REQUIRE(ConvertFromPDG(PDGCode::MuPlus) == Code::MuPlus);
+    REQUIRE(ConvertFromPDG(PDGCode::SigmaStarCMinusBar) == Code::SigmaStarCMinusBar);
   }
 
   SECTION("Lifetimes") {
@@ -70,12 +82,12 @@ TEST_CASE("ParticleProperties", "[Particles]") {
   }
 
   SECTION("Nuclei") {
-    REQUIRE(IsNucleus(Code::Gamma) == false);
-    REQUIRE(IsNucleus(Code::Argon) == true);
-    REQUIRE(IsNucleus(Code::Proton) == false);
-    REQUIRE(IsNucleus(Code::Hydrogen) == true);
-    REQUIRE(Argon::IsNucleus() == true);
-    REQUIRE(EtaC::IsNucleus() == false);
+    REQUIRE_FALSE(IsNucleus(Code::Gamma));
+    REQUIRE(IsNucleus(Code::Argon));
+    REQUIRE_FALSE(IsNucleus(Code::Proton));
+    REQUIRE(IsNucleus(Code::Hydrogen));
+    REQUIRE(Argon::IsNucleus());
+    REQUIRE_FALSE(EtaC::IsNucleus());
 
     REQUIRE(GetNucleusA(Code::Hydrogen) == 1);
     REQUIRE(GetNucleusA(Code::Tritium) == 3);