diff --git a/bilby/gw/prior.py b/bilby/gw/prior.py
index 96c350f8c1b5a3df27d4e65e530e735c11f1d72c..25c97b847558ba2df24652a88f718659ea848059 100644
--- a/bilby/gw/prior.py
+++ b/bilby/gw/prior.py
@@ -25,6 +25,9 @@ except ImportError:
                  " not be able to use some of the prebuilt functions.")
 
 
+DEFAULT_PRIOR_DIR = os.path.join(os.path.dirname(__file__), 'prior_files')
+
+
 class BilbyPriorConversionError(Exception):
     pass
 
@@ -406,17 +409,17 @@ class BBHPriorDict(CBCPriorDict):
             By default this generates many additional parameters, see
             BBHPriorDict.default_conversion_function
         """
-        basedir = os.path.join(os.path.dirname(__file__), 'prior_files')
         if dictionary is None and filename is None:
-            fname = 'binary_black_holes.prior'
             if aligned_spin:
-                fname = 'aligned_spin_' + fname
+                fname = 'aligned_spins_binary_black_holes.prior'
                 logger.info('Using aligned spin prior')
-            filename = os.path.join(basedir, fname)
+            else:
+                fname = 'precessing_spins_binary_black_holes.prior'
+            filename = os.path.join(DEFAULT_PRIOR_DIR, fname)
             logger.info('No prior given, using default BBH priors in {}.'.format(filename))
         elif filename is not None:
             if not os.path.isfile(filename):
-                filename = os.path.join(os.path.dirname(__file__), 'prior_files', filename)
+                filename = os.path.join(DEFAULT_PRIOR_DIR, filename)
         super(BBHPriorDict, self).__init__(dictionary=dictionary, filename=filename,
                                            conversion_function=conversion_function)
 
@@ -514,15 +517,15 @@ class BNSPriorDict(CBCPriorDict):
             BNSPriorDict.default_conversion_function
         """
         if aligned_spin:
-            default_file = 'binary_neutron_stars.prior'
+            default_file = 'aligned_spins_waveform_tides_on.prior'
         else:
-            default_file = 'precessing_binary_neutron_stars.prior'
+            default_file = 'precessing_spins_waveform_tides_on.prior'
         if dictionary is None and filename is None:
-            filename = os.path.join(os.path.dirname(__file__), 'prior_files', default_file)
+            filename = os.path.join(DEFAULT_PRIOR_DIR, default_file)
             logger.info('No prior given, using default BNS priors in {}.'.format(filename))
         elif filename is not None:
             if not os.path.isfile(filename):
-                filename = os.path.join(os.path.dirname(__file__), 'prior_files', filename)
+                filename = os.path.join(DEFAULT_PRIOR_DIR, filename)
         super(BNSPriorDict, self).__init__(dictionary=dictionary, filename=filename,
                                            conversion_function=conversion_function)
 
@@ -628,8 +631,7 @@ class CalibrationPriorDict(PriorDict):
             See superclass
         """
         if dictionary is None and filename is not None:
-            filename = os.path.join(os.path.dirname(__file__),
-                                    'prior_files', filename)
+            filename = os.path.join(DEFAULT_PRIOR_DIR, filename)
         super(CalibrationPriorDict, self).__init__(dictionary=dictionary, filename=filename)
         self.source = None
 
diff --git a/bilby/gw/prior_files/GW150914.prior b/bilby/gw/prior_files/GW150914.prior
index 7c93725862a05046ed2ddf8112c4a5484c456176..b46e182fb8d136d70786d600dda574b838ee4bb4 100644
--- a/bilby/gw/prior_files/GW150914.prior
+++ b/bilby/gw/prior_files/GW150914.prior
@@ -1,15 +1,15 @@
-mass_ratio = Uniform(name='mass_ratio', minimum=0.125, maximum=1, boundary='reflective')
-chirp_mass = Uniform(name='chirp_mass', minimum=25, maximum=31, unit='$M_{\odot}$', boundary='reflective')
+mass_ratio = Uniform(name='mass_ratio', minimum=0.125, maximum=1)
+chirp_mass = Uniform(name='chirp_mass', minimum=25, maximum=31)
 mass_1 = Constraint(name='mass_1', minimum=10, maximum=80)
 mass_2 = Constraint(name='mass_2', minimum=10, maximum=80)
-a_1 = Uniform(name='a_1', minimum=0, maximum=0.99, boundary='reflective')
-a_2 = Uniform(name='a_2', minimum=0, maximum=0.99, boundary='reflective')
+a_1 = Uniform(name='a_1', minimum=0, maximum=0.99)
+a_2 = Uniform(name='a_2', minimum=0, maximum=0.99)
 tilt_1 = Sine(name='tilt_1', boundary='reflective')
 tilt_2 = Sine(name='tilt_2', boundary='reflective')
 phi_12 = Uniform(name='phi_12', minimum=0, maximum=2 * np.pi, boundary='periodic')
 phi_jl = Uniform(name='phi_jl', minimum=0, maximum=2 * np.pi, boundary='periodic')
 luminosity_distance = PowerLaw(alpha=2, name='luminosity_distance', minimum=50, maximum=2000, unit='Mpc', latex_label='$d_L$')
-dec =  Cosine(name='dec', boundary='reflective')
+dec =  Cosine(name='dec')
 ra =  Uniform(name='ra', minimum=0, maximum=2 * np.pi, boundary='periodic')
 theta_jn =  Sine(name='theta_jn', boundary='reflective')
 psi =  Uniform(name='psi', minimum=0, maximum=np.pi, boundary='periodic')
diff --git a/bilby/gw/prior_files/GW170817.prior b/bilby/gw/prior_files/GW170817.prior
index 45c107c7fd3e87f69947e8f04ff233931f54f217..a508e40079d24536510779d1cc2e811d4fce36d6 100644
--- a/bilby/gw/prior_files/GW170817.prior
+++ b/bilby/gw/prior_files/GW170817.prior
@@ -3,16 +3,16 @@
 # mass_2 = Constraint(name='mass_2', minimum=1., maximum=1.4)
 chirp_mass = Uniform(name='chirp_mass', minimum=0.87, maximum=1.74, unit='$M_{\odot}$', boundary=None)
 mass_ratio = Uniform(name='mass_ratio', minimum=0.125, maximum=1.0, boundary=None)
-a_1 = Uniform(name='a_1', minimum=0, maximum=0.05, boundary='reflective')
-a_2 = Uniform(name='a_2', minimum=0, maximum=0.05, boundary='reflective')
-tilt_1 = Sine(name='tilt_1', boundary='reflective')
-tilt_2 = Sine(name='tilt_2', boundary='reflective')
+a_1 = Uniform(name='a_1', minimum=0, maximum=0.05)
+a_2 = Uniform(name='a_2', minimum=0, maximum=0.05)
+tilt_1 = Sine(name='tilt_1')
+tilt_2 = Sine(name='tilt_2')
 phi_12 = Uniform(name='phi_12', minimum=0, maximum=2 * np.pi, boundary='periodic')
 phi_jl = Uniform(name='phi_jl', minimum=0, maximum=2 * np.pi, boundary='periodic')
 luminosity_distance = bilby.gw.prior.UniformSourceFrame(name='luminosity_distance', minimum=10, maximum=100, unit='Mpc', boundary=None)
-dec = Cosine(name='dec', boundary='reflective')
+dec = Cosine(name='dec')
 ra = Uniform(name='ra', minimum=0, maximum=2 * np.pi, boundary='periodic')
-theta_jn = Sine(name='theta_jn', boundary='reflective')
+theta_jn = Sine(name='theta_jn')
 psi = Uniform(name='psi', minimum=0, maximum=np.pi, boundary='periodic')
 phase = Uniform(name='phase', minimum=0, maximum=2 * np.pi, boundary='periodic')
 # lambda_1 = Constraint(name='lambda_1', minimum=0, maximum=5000)
diff --git a/bilby/gw/prior_files/aligned_spin_binary_black_holes.prior b/bilby/gw/prior_files/aligned_spin_binary_black_holes.prior
deleted file mode 100644
index 008fcc498df4c9d72aab713ad5694c4ec7de93ab..0000000000000000000000000000000000000000
--- a/bilby/gw/prior_files/aligned_spin_binary_black_holes.prior
+++ /dev/null
@@ -1,20 +0,0 @@
-# These are the default priors we use for BBH systems.
-# Note that you may wish to use more specific mass and distance parameters.
-# These commands are all known to bilby.gw.prior.
-# Lines beginning "#" are ignored.
-mass_1 = Uniform(name='mass_1', minimum=5, maximum=100, unit='$M_{\odot}$', boundary=None)
-mass_2 = Uniform(name='mass_2', minimum=5, maximum=100, unit='$M_{\odot}$', boundary=None)
-mass_ratio = Constraint(name='mass_ratio', minimum=0.125, maximum=1)
-# chirp_mass = Uniform(name='chirp_mass', minimum=25, maximum=100, unit='$M_{\odot}$', boundary=None)
-# total_mass = Uniform(name='total_mass', minimum=10, maximum=200, unit='$M_{\odot}$', boundary=None)
-# mass_ratio = Uniform(name='mass_ratio', minimum=0.125, maximum=1, boundary=None)
-# symmetric_mass_ratio =  Uniform(name='symmetric_mass_ratio', minimum=8 / 81, maximum=0.25, boundary=None)
-chi_1 = bilby.gw.prior.AlignedSpin(name='chi_1', a_prior=Uniform(minimum=0, maximum=0.8), boundary='reflective')
-chi_2 = bilby.gw.prior.AlignedSpin(name='chi_2', a_prior=Uniform(minimum=0, maximum=0.8), boundary='reflective')
-luminosity_distance = bilby.gw.prior.UniformSourceFrame(name='luminosity_distance', minimum=1e2, maximum=5e3, unit='Mpc', boundary=None)
-dec = Cosine(name='dec', boundary='reflective')
-ra = Uniform(name='ra', minimum=0, maximum=2 * np.pi, boundary='periodic')
-theta_jn = Sine(name='theta_jn', boundary='reflective')
-# cos_theta_jn = Uniform(name='cos_theta_jn', minimum=-1, maximum=1, boundary=None)
-psi = Uniform(name='psi', minimum=0, maximum=np.pi, boundary='periodic')
-phase = Uniform(name='phase', minimum=0, maximum=2 * np.pi, boundary='periodic')
diff --git a/bilby/gw/prior_files/aligned_spins_binary_black_holes.prior b/bilby/gw/prior_files/aligned_spins_binary_black_holes.prior
new file mode 100644
index 0000000000000000000000000000000000000000..9dda5d5bb367d3bfa1a7132279e203ddf3ffe2f2
--- /dev/null
+++ b/bilby/gw/prior_files/aligned_spins_binary_black_holes.prior
@@ -0,0 +1,16 @@
+# These are the default priors we use for BBH systems.
+# Note that you may wish to use more specific mass and distance parameters.
+# These commands are all known to bilby.gw.prior.
+# Lines beginning "#" are ignored.
+mass_1 = Constraint(name='mass_1', minimum=5, maximum=100)
+mass_2 = Constraint(name='mass_2', minimum=5, maximum=100)
+mass_ratio = Uniform(name='mass_ratio', minimum=0.125, maximum=1)
+chirp_mass = Uniform(name='chirp_mass', minimum=25, maximum=100)
+chi_1 = bilby.gw.prior.AlignedSpin(name='chi_1', a_prior=Uniform(minimum=0, maximum=0.99))
+chi_2 = bilby.gw.prior.AlignedSpin(name='chi_2', a_prior=Uniform(minimum=0, maximum=0.99))
+luminosity_distance = bilby.gw.prior.UniformSourceFrame(name='luminosity_distance', minimum=1e2, maximum=5e3)
+dec = Cosine(name='dec')
+ra = Uniform(name='ra', minimum=0, maximum=2 * np.pi, boundary='periodic')
+theta_jn = Sine(name='theta_jn')
+psi = Uniform(name='psi', minimum=0, maximum=np.pi, boundary='periodic')
+phase = Uniform(name='phase', minimum=0, maximum=2 * np.pi, boundary='periodic')
diff --git a/bilby/gw/prior_files/aligned_spins_waveform_tides_off.prior b/bilby/gw/prior_files/aligned_spins_waveform_tides_off.prior
index 31c3ce00109f4e86e4639d61e0a104ba7922cc89..b15bfa6c5019ede7bfcb0d353a1380c822e2e2e4 100644
--- a/bilby/gw/prior_files/aligned_spins_waveform_tides_off.prior
+++ b/bilby/gw/prior_files/aligned_spins_waveform_tides_off.prior
@@ -1,12 +1,12 @@
 chirp_mass = Uniform(name='chirp_mass', minimum=3.56, maximum=3.68)
 mass_ratio = Uniform(name='mass_ratio', minimum=0.05, maximum=1)
-mass_1 = Constraint(name='mass_1', minimum=1.00, maximum=22.0) #optional
-mass_2 = Constraint(name='mass_2', minimum=1.00, maximum=2.95) #optional
+mass_1 = Constraint(name='mass_1', minimum=1.00, maximum=22.0)
+mass_2 = Constraint(name='mass_2', minimum=1.00, maximum=2.95)
 chi_1 = bilby.gw.prior.AlignedSpin(name='chi_1', a_prior=Uniform(minimum=0, maximum=0.5))
 chi_2 = bilby.gw.prior.AlignedSpin(name='chi_2', a_prior=Uniform(minimum=0, maximum=0.05))
 luminosity_distance = bilby.core.prior.PowerLaw(alpha=2, name='luminosity_distance', minimum=1, maximum=750, unit='Mpc')
 ra = Uniform(minimum=0, maximum=2 * np.pi, name='ra',  boundary='periodic')
 dec = Cosine(name='dec')
-cos_theta_jn = Uniform(name='cos_theta_jn', minimum=-1, maximum=1)
+theta_jn = Sine(name='theta_jn')
 psi = Uniform(name='psi', minimum=0, maximum=np.pi, boundary='periodic')
 phase = Uniform(name='phase', minimum=0, maximum=2 * np.pi, boundary='periodic')
diff --git a/bilby/gw/prior_files/aligned_spins_waveform_tides_on.prior b/bilby/gw/prior_files/aligned_spins_waveform_tides_on.prior
index 96cb469b939f242f970aba1b5b8ea761602eee77..6c318f1b36147a17c8e1e01e9429a6778d7f0756 100644
--- a/bilby/gw/prior_files/aligned_spins_waveform_tides_on.prior
+++ b/bilby/gw/prior_files/aligned_spins_waveform_tides_on.prior
@@ -1,13 +1,13 @@
 chirp_mass = Uniform(name='chirp_mass', minimum=3.56, maximum=3.68)
 mass_ratio = Uniform(name='mass_ratio', minimum=0.05, maximum=1)
-mass_1 = Constraint(name='mass_1', minimum=1.00, maximum=22.0) #optional
-mass_2 = Constraint(name='mass_2', minimum=1.00, maximum=2.95) #optional
+mass_1 = Constraint(name='mass_1', minimum=1.00, maximum=22.0)
+mass_2 = Constraint(name='mass_2', minimum=1.00, maximum=2.95)
 chi_1 = bilby.gw.prior.AlignedSpin(name='chi_1', a_prior=Uniform(minimum=0, maximum=0.5))
 chi_2 = bilby.gw.prior.AlignedSpin(name='chi_2', a_prior=Uniform(minimum=0, maximum=0.05))
 luminosity_distance = bilby.core.prior.PowerLaw(alpha=2, name='luminosity_distance', minimum=1, maximum=750, unit='Mpc')
 ra = Uniform(minimum=0, maximum=2 * np.pi, name='ra',  boundary='periodic')
 dec = Cosine(name='dec')
-cos_theta_jn = Uniform(name='cos_theta_jn', minimum=-1, maximum=1)
+theta_jn = Sine(name='theta_jn')
 psi = Uniform(name='psi', minimum=0, maximum=np.pi, boundary='periodic')
 phase = Uniform(name='phase', minimum=0, maximum=2 * np.pi, boundary='periodic')
 lambda_1 = Uniform(name='lambda_2', minimum=0, maximum=5000)
diff --git a/bilby/gw/prior_files/binary_black_holes.prior b/bilby/gw/prior_files/binary_black_holes.prior
deleted file mode 100644
index a680eae1ec1b804f689bd00407696126f4a60d55..0000000000000000000000000000000000000000
--- a/bilby/gw/prior_files/binary_black_holes.prior
+++ /dev/null
@@ -1,26 +0,0 @@
-# These are the default priors we use for BBH systems.
-# Note that you may wish to use more specific mass and distance parameters.
-# These commands are all known to bilby.gw.prior.
-# Lines beginning "#" are ignored.
-mass_1 = Uniform(name='mass_1', minimum=5, maximum=100, unit='$M_{\odot}$', boundary=None)
-mass_2 = Uniform(name='mass_2', minimum=5, maximum=100, unit='$M_{\odot}$', boundary=None)
-mass_ratio = Constraint(name='mass_ratio', minimum=0.125, maximum=1)
-# chirp_mass = Uniform(name='chirp_mass', minimum=25, maximum=100, unit='$M_{\odot}$', boundary=None)
-# total_mass = Uniform(name='total_mass', minimum=10, maximum=200, unit='$M_{\odot}$', boundary=None)
-# mass_ratio = Uniform(name='mass_ratio', minimum=0.125, maximum=1, boundary=None)
-# symmetric_mass_ratio = Uniform(name='symmetric_mass_ratio', minimum=8 / 81, maximum=0.25, boundary=None)
-a_1 = Uniform(name='a_1', minimum=0, maximum=0.8, boundary='reflective')
-a_2 = Uniform(name='a_2', minimum=0, maximum=0.8, boundary='reflective')
-tilt_1 = Sine(name='tilt_1', boundary='reflective')
-tilt_2 = Sine(name='tilt_2', boundary='reflective')
-# cos_tilt_1 = Uniform(name='cos_tilt_1', minimum=-1, maximum=1, boundary=None)
-# cos_tilt_2 = Uniform(name='cos_tilt_2', minimum=-1, maximum=1, boundary=None)
-phi_12 = Uniform(name='phi_12', minimum=0, maximum=2 * np.pi, boundary='periodic')
-phi_jl = Uniform(name='phi_jl', minimum=0, maximum=2 * np.pi, boundary='periodic')
-luminosity_distance = bilby.gw.prior.UniformSourceFrame(name='luminosity_distance', minimum=1e2, maximum=5e3, unit='Mpc', boundary=None)
-dec = Cosine(name='dec', boundary='reflective')
-ra = Uniform(name='ra', minimum=0, maximum=2 * np.pi, boundary='periodic')
-theta_jn = Sine(name='theta_jn', boundary='reflective')
-# cos_theta_jn = Uniform(name='cos_theta_jn', minimum=-1, maximum=1, boundary=None)
-psi = Uniform(name='psi', minimum=0, maximum=np.pi, boundary='periodic')
-phase = Uniform(name='phase', minimum=0, maximum=2 * np.pi, boundary='periodic')
diff --git a/bilby/gw/prior_files/binary_neutron_stars.prior b/bilby/gw/prior_files/binary_neutron_stars.prior
deleted file mode 100644
index 9b57ff3aa0ff279aeef933d91fcd47816cef9a64..0000000000000000000000000000000000000000
--- a/bilby/gw/prior_files/binary_neutron_stars.prior
+++ /dev/null
@@ -1,24 +0,0 @@
-# These are the default priors we use for BNS systems.
-# Note that you may wish to use more specific mass and distance parameters.
-# These commands are all known to bilby.gw.prior.
-# Lines beginning "#" are ignored.
-mass_1 = Uniform(name='mass_1', minimum=1, maximum=2, unit='$M_{\odot}$', boundary=None)
-mass_2 = Uniform(name='mass_2', minimum=1, maximum=2, unit='$M_{\odot}$', boundary=None)
-mass_ratio = Constraint(name='mass_ratio', minimum=0.125, maximum=1)
-# chirp_mass = Uniform(name='chirp_mass', minimum=0.87, maximum=1.74, unit='$M_{\odot}$', boundary=None)
-# total_mass = Uniform(name='total_mass', minimum=2, maximum=4, unit='$M_{\odot}$', boundary=None)
-# mass_ratio = Uniform(name='mass_ratio', minimum=0.5, maximum=1, boundary=None)
-# symmetric_mass_ratio = Uniform(name='symmetric_mass_ratio', minimum=0.22, maximum=0.25, boundary=None)
-chi_1 = bilby.gw.prior.AlignedSpin(a_prior=Uniform(0, 0.05), z_prior=Uniform(-1, 1), name='chi_1', latex_label='$\chi_1$', boundary='reflective')
-chi_2 = bilby.gw.prior.AlignedSpin(a_prior=Uniform(0, 0.05), z_prior=Uniform(-1, 1), name='chi_2', latex_label='$\chi_2$', boundary='reflective')
-luminosity_distance = bilby.gw.prior.UniformSourceFrame(name='luminosity_distance', minimum=10, maximum=500, unit='Mpc', boundary=None)
-dec = Cosine(name='dec', boundary='reflective')
-ra = Uniform(name='ra', minimum=0, maximum=2 * np.pi, boundary='periodic')
-theta_jn = Sine(name='theta_jn', boundary='reflective')
-# cos_theta_jn = Uniform(name='cos_theta_jn', minimum=-1, maximum=1, boundary=None)
-psi = Uniform(name='psi', minimum=0, maximum=np.pi, boundary='periodic')
-phase = Uniform(name='phase', minimum=0, maximum=2 * np.pi, boundary='periodic')
-lambda_1 = Uniform(name='lambda_1', minimum=0, maximum=3000, boundary=None)
-lambda_2 = Uniform(name='lambda_2', minimum=0, maximum=3000, boundary=None)
-# lambda_tilde = Uniform(name='lambda_tilde', minimum=0, maximum=5000, boundary=None)
-# delta_lambda_tilde = Uniform(name='delta_lambda_tilde', minimum=-5000, maximum=5000, boundary=None)
diff --git a/bilby/gw/prior_files/precessing_binary_neutron_stars.prior b/bilby/gw/prior_files/precessing_binary_neutron_stars.prior
deleted file mode 100644
index 913dfd5246a3a1a35621368a8fe512cdb9f5fc09..0000000000000000000000000000000000000000
--- a/bilby/gw/prior_files/precessing_binary_neutron_stars.prior
+++ /dev/null
@@ -1,30 +0,0 @@
-# These are the default priors we use for BNS systems.
-# Note that you may wish to use more specific mass and distance parameters.
-# These commands are all known to bilby.gw.prior.
-# Lines beginning "#" are ignored.
-mass_1 = Uniform(name='mass_1', minimum=1, maximum=2, unit='$M_{\odot}$', boundary=None)
-mass_2 = Uniform(name='mass_2', minimum=1, maximum=2, unit='$M_{\odot}$', boundary=None)
-mass_ratio = Constraint(name='mass_ratio', minimum=0.125, maximum=1)
-# chirp_mass = Uniform(name='chirp_mass', minimum=0.87, maximum=1.74, unit='$M_{\odot}$', boundary=None)
-# total_mass = Uniform(name='total_mass', minimum=2, maximum=4, unit='$M_{\odot}$', boundary=None)
-# mass_ratio = Uniform(name='mass_ratio', minimum=0.5, maximum=1, boundary=None)
-# symmetric_mass_ratio = Uniform(name='symmetric_mass_ratio', minimum=0.22, maximum=0.25, boundary=None)
-a_1 = Uniform(name='a_1', minimum=0, maximum=0.05, boundary='reflective')
-a_2 = Uniform(name='a_2', minimum=0, maximum=0.05, boundary='reflective')
-tilt_1 = Sine(name='tilt_1', boundary='reflective')
-tilt_2 = Sine(name='tilt_2', boundary='reflective')
-# cos_tilt_1 = Uniform(name='cos_tilt_1', minimum=-1, maximum=1, boundary=None)
-# cos_tilt_2 = Uniform(name='cos_tilt_2', minimum=-1, maximum=1, boundary=None)
-phi_12 = Uniform(name='phi_12', minimum=0, maximum=2 * np.pi, boundary='periodic')
-phi_jl = Uniform(name='phi_jl', minimum=0, maximum=2 * np.pi, boundary='periodic')
-luminosity_distance = bilby.gw.prior.UniformSourceFrame(name='luminosity_distance', minimum=10, maximum=500, unit='Mpc', boundary=None)
-dec = Cosine(name='dec', boundary='reflective')
-ra = Uniform(name='ra', minimum=0, maximum=2 * np.pi, boundary='periodic')
-theta_jn = Sine(name='theta_jn', boundary='reflective')
-# cos_theta_jn = Uniform(name='cos_theta_jn', minimum=-1, maximum=1, boundary=None)
-psi = Uniform(name='psi', minimum=0, maximum=np.pi, boundary='periodic')
-phase = Uniform(name='phase', minimum=0, maximum=2 * np.pi, boundary='periodic')
-lambda_1 = Uniform(name='lambda_1', minimum=0, maximum=3000, boundary=None)
-lambda_2 = Uniform(name='lambda_2', minimum=0, maximum=3000, boundary=None)
-# lambda_tilde = Uniform(name='lambda_tilde', minimum=0, maximum=5000, boundary=None)
-# delta_lambda_tilde = Uniform(name='delta_lambda_tilde', minimum=-5000, maximum=5000, boundary=None)
diff --git a/bilby/gw/prior_files/precessing_spins_binary_black_holes.prior b/bilby/gw/prior_files/precessing_spins_binary_black_holes.prior
new file mode 100644
index 0000000000000000000000000000000000000000..06549e63ed36ff159035ff1fd02ad7465df62f3d
--- /dev/null
+++ b/bilby/gw/prior_files/precessing_spins_binary_black_holes.prior
@@ -0,0 +1,20 @@
+# These are the default priors we use for BBH systems.
+# Note that you may wish to use more specific mass and distance parameters.
+# These commands are all known to bilby.gw.prior.
+# Lines beginning "#" are ignored.
+mass_1 = Constraint(name='mass_1', minimum=5, maximum=100)
+mass_2 = Constraint(name='mass_2', minimum=5, maximum=100)
+mass_ratio = Uniform(name='mass_ratio', minimum=0.125, maximum=1)
+chirp_mass = Uniform(name='chirp_mass', minimum=25, maximum=100)
+a_1 = Uniform(name='a_1', minimum=0, maximum=0.99)
+a_2 = Uniform(name='a_2', minimum=0, maximum=0.99)
+tilt_1 = Sine(name='tilt_1')
+tilt_2 = Sine(name='tilt_2')
+phi_12 = Uniform(name='phi_12', minimum=0, maximum=2 * np.pi, boundary='periodic')
+phi_jl = Uniform(name='phi_jl', minimum=0, maximum=2 * np.pi, boundary='periodic')
+luminosity_distance = bilby.gw.prior.UniformSourceFrame(name='luminosity_distance', minimum=1e2, maximum=5e3)
+dec = Cosine(name='dec')
+ra = Uniform(name='ra', minimum=0, maximum=2 * np.pi, boundary='periodic')
+theta_jn = Sine(name='theta_jn')
+psi = Uniform(name='psi', minimum=0, maximum=np.pi, boundary='periodic')
+phase = Uniform(name='phase', minimum=0, maximum=2 * np.pi, boundary='periodic')
diff --git a/bilby/gw/prior_files/precessing_spins_waveform_tides_off.prior b/bilby/gw/prior_files/precessing_spins_waveform_tides_off.prior
index cd3da227898cf0f7e6265147daf030c7808e8f17..3bc8ebab2c97a1ab4b464511f53a10a5be726013 100644
--- a/bilby/gw/prior_files/precessing_spins_waveform_tides_off.prior
+++ b/bilby/gw/prior_files/precessing_spins_waveform_tides_off.prior
@@ -11,6 +11,6 @@ phi_jl = Uniform(name='phi_jl', minimum=0, maximum=2 * np.pi, boundary='periodic
 luminosity_distance = bilby.gw.prior.UniformComovingVolume(name='luminosity_distance', minimum=1, maximum=750, unit='Mpc')
 ra = Uniform(minimum=0, maximum=2 * np.pi, name='ra',  boundary='periodic')
 dec = Cosine(name='dec')
-cos_theta_jn = Uniform(name='cos_theta_jn', minimum=-1, maximum=1)
+theta_jn = Sine(name='theta_jn')
 psi = Uniform(name='psi', minimum=0, maximum=np.pi, boundary='periodic')
 phase = Uniform(name='phase', minimum=0, maximum=2 * np.pi, boundary='periodic')
diff --git a/bilby/gw/prior_files/precessing_spins_waveform_tides_on.prior b/bilby/gw/prior_files/precessing_spins_waveform_tides_on.prior
index 12f329e1c91985b14430a514ee38e1cfe82be61b..d82a4f173bd265533c70261ee9ede10b5f298166 100644
--- a/bilby/gw/prior_files/precessing_spins_waveform_tides_on.prior
+++ b/bilby/gw/prior_files/precessing_spins_waveform_tides_on.prior
@@ -11,7 +11,7 @@ phi_jl = Uniform(name='phi_jl', minimum=0, maximum=2 * np.pi, boundary='periodic
 luminosity_distance = bilby.gw.prior.UniformComovingVolume(name='luminosity_distance', minimum=1, maximum=750, unit='Mpc')
 ra = Uniform(minimum=0, maximum=2 * np.pi, name='ra',  boundary='periodic')
 dec = Cosine(name='dec')
-cos_theta_jn = Uniform(name='cos_theta_jn', minimum=-1, maximum=1)
+theta_jn = Sine(name='theta_jn')
 psi = Uniform(name='psi', minimum=0, maximum=np.pi, boundary='periodic')
 phase = Uniform(name='phase', minimum=0, maximum=2 * np.pi, boundary='periodic')
 lambda_1 = Uniform(name='lambda_2', minimum=0, maximum=5000)
diff --git a/test/gw_prior_test.py b/test/gw_prior_test.py
index fb45d589ad35b6c44d73c13f1bdd0c5f65e9183f..171977652bb001f3fb392cfebeca757a72349472 100644
--- a/test/gw_prior_test.py
+++ b/test/gw_prior_test.py
@@ -1,6 +1,7 @@
 from __future__ import division, absolute_import
 from collections import OrderedDict
 import unittest
+import glob
 import os
 import sys
 import pickle
@@ -25,7 +26,7 @@ class TestBBHPriorDict(unittest.TestCase):
         )
         self.filename = os.path.join(
             os.path.dirname(os.path.realpath(__file__)),
-            "prior_files/binary_black_holes.prior",
+            "prior_files/precessing_spins_binary_black_holes.prior",
         )
         self.bbh_prior_dict = bilby.gw.prior.BBHPriorDict(filename=self.filename)
         for key, value in self.bbh_prior_dict.items():
@@ -101,8 +102,8 @@ class TestBBHPriorDict(unittest.TestCase):
             self.assertTrue(self.bbh_prior_dict.test_redundancy(prior))
 
     def test_correct_not_redundant_priors_masses(self):
-        del self.bbh_prior_dict["mass_2"]
-        for prior in ["mass_2", "chirp_mass", "total_mass", "symmetric_mass_ratio"]:
+        del self.bbh_prior_dict["chirp_mass"]
+        for prior in ["chirp_mass", "total_mass", "symmetric_mass_ratio"]:
             self.assertFalse(self.bbh_prior_dict.test_redundancy(prior))
 
     def test_correct_not_redundant_priors_spin_magnitudes(self):
@@ -140,9 +141,9 @@ class TestBBHPriorDict(unittest.TestCase):
     def test_test_has_redundant_priors(self):
         self.assertFalse(self.bbh_prior_dict.test_has_redundant_keys())
         for prior in [
-            "chirp_mass",
+            "mass_1",
+            "mass_2",
             "total_mass",
-            "mass_ratio",
             "symmetric_mass_ratio",
             "cos_tilt_1",
             "cos_tilt_2",
@@ -266,26 +267,27 @@ class TestPackagedPriors(unittest.TestCase):
     """ Test that the prepackaged priors load """
 
     def test_aligned(self):
-        filename = "aligned_spin_binary_black_holes.prior"
+        filename = "aligned_spins_binary_black_holes.prior"
         prior_dict = bilby.gw.prior.BBHPriorDict(filename=filename)
         self.assertTrue("chi_1" in prior_dict)
         self.assertTrue("chi_2" in prior_dict)
 
-    def test_precessing(self):
-        filename = "precessing_binary_neutron_stars.prior"
-        prior_dict = bilby.gw.prior.BBHPriorDict(filename=filename)
-        self.assertTrue("lambda_1" in prior_dict)
-        self.assertTrue("lambda_2" in prior_dict)
-
     def test_binary_black_holes(self):
-        filename = "binary_black_holes.prior"
+        filename = "precessing_spins_binary_black_holes.prior"
         prior_dict = bilby.gw.prior.BBHPriorDict(filename=filename)
         self.assertTrue("a_1" in prior_dict)
 
-    def test_binary_neutron_stars(self):
-        filename = "binary_neutron_stars.prior"
-        prior_dict = bilby.gw.prior.BNSPriorDict(filename=filename)
-        self.assertTrue("lambda_1" in prior_dict)
+    def test_all(self):
+        prior_files = glob.glob(bilby.gw.prior.DEFAULT_PRIOR_DIR + "/*prior")
+        for ff in prior_files:
+            print("Checking prior file {}".format(ff))
+            prior_dict = bilby.gw.prior.BBHPriorDict(filename=ff)
+            self.assertTrue("chirp_mass" in prior_dict)
+            self.assertTrue("mass_ratio" in prior_dict)
+            if "precessing" in ff:
+                self.assertTrue("a_1" in prior_dict)
+            elif "aligned" in ff:
+                self.assertTrue("chi_1" in prior_dict)
 
 
 class TestBNSPriorDict(unittest.TestCase):
@@ -296,7 +298,7 @@ class TestBNSPriorDict(unittest.TestCase):
         )
         self.filename = os.path.join(
             os.path.dirname(os.path.realpath(__file__)),
-            "prior_files/binary_neutron_stars.prior",
+            "prior_files/aligned_spins_waveform_tides_on.prior",
         )
         self.bns_prior_dict = bilby.gw.prior.BNSPriorDict(filename=self.filename)
         for key, value in self.bns_prior_dict.items():
@@ -369,8 +371,8 @@ class TestBNSPriorDict(unittest.TestCase):
             self.assertTrue(self.bns_prior_dict.test_redundancy(prior))
 
     def test_correct_not_redundant_priors_masses(self):
-        del self.bns_prior_dict["mass_2"]
-        for prior in ["mass_2", "chirp_mass", "total_mass", "symmetric_mass_ratio"]:
+        del self.bns_prior_dict["chirp_mass"]
+        for prior in ["chirp_mass", "total_mass", "symmetric_mass_ratio"]:
             self.assertFalse(self.bns_prior_dict.test_redundancy(prior))
 
     def test_correct_not_redundant_priors_spin_magnitudes(self):
@@ -398,9 +400,9 @@ class TestBNSPriorDict(unittest.TestCase):
     def test_test_has_redundant_priors(self):
         self.assertFalse(self.bns_prior_dict.test_has_redundant_keys())
         for prior in [
-            "chirp_mass",
+            "mass_1",
+            "mass_2",
             "total_mass",
-            "mass_ratio",
             "symmetric_mass_ratio",
             "cos_theta_jn",
             "comoving_distance",
diff --git a/test/prior_files/aligned_spins_waveform_tides_on.prior b/test/prior_files/aligned_spins_waveform_tides_on.prior
new file mode 100644
index 0000000000000000000000000000000000000000..6c318f1b36147a17c8e1e01e9429a6778d7f0756
--- /dev/null
+++ b/test/prior_files/aligned_spins_waveform_tides_on.prior
@@ -0,0 +1,14 @@
+chirp_mass = Uniform(name='chirp_mass', minimum=3.56, maximum=3.68)
+mass_ratio = Uniform(name='mass_ratio', minimum=0.05, maximum=1)
+mass_1 = Constraint(name='mass_1', minimum=1.00, maximum=22.0)
+mass_2 = Constraint(name='mass_2', minimum=1.00, maximum=2.95)
+chi_1 = bilby.gw.prior.AlignedSpin(name='chi_1', a_prior=Uniform(minimum=0, maximum=0.5))
+chi_2 = bilby.gw.prior.AlignedSpin(name='chi_2', a_prior=Uniform(minimum=0, maximum=0.05))
+luminosity_distance = bilby.core.prior.PowerLaw(alpha=2, name='luminosity_distance', minimum=1, maximum=750, unit='Mpc')
+ra = Uniform(minimum=0, maximum=2 * np.pi, name='ra',  boundary='periodic')
+dec = Cosine(name='dec')
+theta_jn = Sine(name='theta_jn')
+psi = Uniform(name='psi', minimum=0, maximum=np.pi, boundary='periodic')
+phase = Uniform(name='phase', minimum=0, maximum=2 * np.pi, boundary='periodic')
+lambda_1 = Uniform(name='lambda_2', minimum=0, maximum=5000)
+lambda_2 = Uniform(name='lambda_2', minimum=0, maximum=5000)
diff --git a/test/prior_files/binary_black_holes.prior b/test/prior_files/binary_black_holes.prior
deleted file mode 100644
index a0adce72a5f558364b50e8470c2cd54a38921ef0..0000000000000000000000000000000000000000
--- a/test/prior_files/binary_black_holes.prior
+++ /dev/null
@@ -1,26 +0,0 @@
-# These are the default priors we use for BBH systems.
-# Note that you may wish to use more specific mass and distance parameters.
-# These commands are all known to bilby.gw.prior.
-# Lines beginning "#" are ignored.
-mass_1 = Uniform(name='mass_1', minimum=5, maximum=100, unit='$M_{\odot}$', boundary=None)
-mass_2 = Uniform(name='mass_2', minimum=5, maximum=100, unit='$M_{\odot}$', boundary=None)
-mass_ratio = Constraint(name='mass_ratio', minimum=0.125, maximum=1)
-# chirp_mass = Uniform(name='chirp_mass', minimum=25, maximum=100, unit='$M_{\odot}$', boundary=None)
-# total_mass = Uniform(name='total_mass', minimum=10, maximum=200, unit='$M_{\odot}$', boundary=None)
-# mass_ratio = Uniform(name='mass_ratio', minimum=0.125, maximum=1, boundary=None)
-# symmetric_mass_ratio =  Uniform(name='symmetric_mass_ratio', minimum=8 / 81, maximum=0.25, boundary=None)
-a_1 = Uniform(name='a_1', minimum=0, maximum=0.8, boundary='reflective')
-a_2 = Uniform(name='a_2', minimum=0, maximum=0.8, boundary='reflective')
-tilt_1 = Sine(name='tilt_1', boundary='reflective')
-tilt_2 = Sine(name='tilt_2', boundary='reflective')
-# cos_tilt_1 = Uniform(name='cos_tilt_1', minimum=-1, maximum=1, boundary=None)
-# cos_tilt_2 = Uniform(name='cos_tilt_2', minimum=-1, maximum=1, boundary=None)
-phi_12 = Uniform(name='phi_12', minimum=0, maximum=2 * np.pi, boundary='periodic')
-phi_jl = Uniform(name='phi_jl', minimum=0, maximum=2 * np.pi, boundary='periodic')
-luminosity_distance = bilby.gw.prior.UniformSourceFrame(name='luminosity_distance', minimum=1e2, maximum=5e3, unit='Mpc', boundary=None)
-dec = Cosine(name='dec', boundary='reflective')
-ra = Uniform(name='ra', minimum=0, maximum=2 * np.pi, boundary='periodic')
-theta_jn = Sine(name='theta_jn', boundary='reflective')
-# cos_theta_jn = Uniform(name='cos_theta_jn', minimum=-1, maximum=1, boundary=None)
-psi = Uniform(name='psi', minimum=0, maximum=np.pi, boundary='periodic')
-phase = Uniform(name='phase', minimum=0, maximum=2 * np.pi, boundary='periodic')
diff --git a/test/prior_files/binary_neutron_stars.prior b/test/prior_files/binary_neutron_stars.prior
deleted file mode 100644
index cb5da60d29fa84a2877bc653145fdc1a7db372e1..0000000000000000000000000000000000000000
--- a/test/prior_files/binary_neutron_stars.prior
+++ /dev/null
@@ -1,24 +0,0 @@
-# These are the default priors we use for BNS systems.
-# Note that you may wish to use more specific mass and distance parameters.
-# These commands are all known to bilby.gw.prior.
-# Lines beginning "#" are ignored.
-mass_1 = Uniform(name='mass_1', minimum=1, maximum=2, unit='$M_{\odot}$', boundary=None)
-mass_2 = Uniform(name='mass_2', minimum=1, maximum=2, unit='$M_{\odot}$', boundary=None)
-mass_ratio = Constraint(name='mass_ratio', minimum=0.125, maximum=1)
-# chirp_mass = Uniform(name='chirp_mass', minimum=0.87, maximum=1.74, unit='$M_{\odot}$', boundary=None)
-# total_mass = Uniform(name='total_mass', minimum=2, maximum=4, unit='$M_{\odot}$', boundary=None)
-# mass_ratio = Uniform(name='mass_ratio', minimum=0.5, maximum=1, boundary=None)
-# symmetric_mass_ratio = Uniform(name='symmetric_mass_ratio', minimum=0.22, maximum=0.25, boundary=None)
-chi_1 = bilby.gw.prior.AlignedSpin(a_prior=Uniform(0, 0.05), z_prior=Uniform(-1, 1), name='chi_1', latex_label='$\\chi_1$', boundary='reflective')
-chi_2 = bilby.gw.prior.AlignedSpin(a_prior=Uniform(0, 0.05), z_prior=Uniform(-1, 1), name='chi_2', latex_label='$\\chi_2$', boundary='reflective')
-luminosity_distance = bilby.gw.prior.UniformSourceFrame(name='luminosity_distance', minimum=10, maximum=500, unit='Mpc', boundary=None)
-dec = Cosine(name='dec', boundary='reflective')
-ra = Uniform(name='ra', minimum=0, maximum=2 * np.pi, boundary='periodic')
-theta_jn = Sine(name='theta_jn', boundary='reflective')
-# cos_theta_jn = Uniform(name='cos_theta_jn', minimum=-1, maximum=1, boundary=None)
-psi = Uniform(name='psi', minimum=0, maximum=np.pi, boundary='periodic')
-phase = Uniform(name='phase', minimum=0, maximum=2 * np.pi, boundary='periodic')
-lambda_1 = Uniform(name='lambda_1', minimum=0, maximum=3000, boundary=None)
-lambda_2 = Uniform(name='lambda_2', minimum=0, maximum=3000, boundary=None)
-# lambda_tilde = Uniform(name='lambda_tilde', minimum=0, maximum=5000, boundary=None)
-# delta_lambda = Uniform(name='delta_lambda', minimum=-5000, maximum=5000, boundary=None)
diff --git a/test/prior_files/precessing_spins_binary_black_holes.prior b/test/prior_files/precessing_spins_binary_black_holes.prior
new file mode 100644
index 0000000000000000000000000000000000000000..06549e63ed36ff159035ff1fd02ad7465df62f3d
--- /dev/null
+++ b/test/prior_files/precessing_spins_binary_black_holes.prior
@@ -0,0 +1,20 @@
+# These are the default priors we use for BBH systems.
+# Note that you may wish to use more specific mass and distance parameters.
+# These commands are all known to bilby.gw.prior.
+# Lines beginning "#" are ignored.
+mass_1 = Constraint(name='mass_1', minimum=5, maximum=100)
+mass_2 = Constraint(name='mass_2', minimum=5, maximum=100)
+mass_ratio = Uniform(name='mass_ratio', minimum=0.125, maximum=1)
+chirp_mass = Uniform(name='chirp_mass', minimum=25, maximum=100)
+a_1 = Uniform(name='a_1', minimum=0, maximum=0.99)
+a_2 = Uniform(name='a_2', minimum=0, maximum=0.99)
+tilt_1 = Sine(name='tilt_1')
+tilt_2 = Sine(name='tilt_2')
+phi_12 = Uniform(name='phi_12', minimum=0, maximum=2 * np.pi, boundary='periodic')
+phi_jl = Uniform(name='phi_jl', minimum=0, maximum=2 * np.pi, boundary='periodic')
+luminosity_distance = bilby.gw.prior.UniformSourceFrame(name='luminosity_distance', minimum=1e2, maximum=5e3)
+dec = Cosine(name='dec')
+ra = Uniform(name='ra', minimum=0, maximum=2 * np.pi, boundary='periodic')
+theta_jn = Sine(name='theta_jn')
+psi = Uniform(name='psi', minimum=0, maximum=np.pi, boundary='periodic')
+phase = Uniform(name='phase', minimum=0, maximum=2 * np.pi, boundary='periodic')
diff --git a/test/prior_test.py b/test/prior_test.py
index 280d84b970fe209c7f92d81b6d0357fa5fad4b03..a0c57c49371ceadf19c21c21ca4a7fd592b68c41 100644
--- a/test/prior_test.py
+++ b/test/prior_test.py
@@ -911,7 +911,7 @@ class TestPriorDict(unittest.TestCase):
         self.prior_set_from_dict = bilby.core.prior.PriorDict(dictionary=self.priors)
         self.default_prior_file = os.path.join(
             os.path.dirname(os.path.realpath(__file__)),
-            "prior_files/binary_black_holes.prior",
+            "prior_files/precessing_spins_binary_black_holes.prior",
         )
         self.prior_set_from_file = bilby.core.prior.PriorDict(
             filename=self.default_prior_file
@@ -946,21 +946,23 @@ class TestPriorDict(unittest.TestCase):
 
     def test_read_from_file(self):
         expected = dict(
-            mass_1=bilby.core.prior.Uniform(
+            mass_1=bilby.core.prior.Constraint(
                 name="mass_1",
                 minimum=5,
                 maximum=100,
-                unit="$M_{\\odot}$",
-                boundary=None,
             ),
-            mass_2=bilby.core.prior.Uniform(
+            mass_2=bilby.core.prior.Constraint(
                 name="mass_2",
                 minimum=5,
                 maximum=100,
-                unit="$M_{\\odot}$",
-                boundary=None,
             ),
-            mass_ratio=bilby.core.prior.Constraint(
+            chirp_mass=bilby.core.prior.Uniform(
+                name="chirp_mass",
+                minimum=25,
+                maximum=100,
+                latex_label="$\mathcal{M}$",
+            ),
+            mass_ratio=bilby.core.prior.Uniform(
                 name="mass_ratio",
                 minimum=0.125,
                 maximum=1,
@@ -968,13 +970,13 @@ class TestPriorDict(unittest.TestCase):
                 unit=None,
             ),
             a_1=bilby.core.prior.Uniform(
-                name="a_1", minimum=0, maximum=0.8, boundary="reflective"
+                name="a_1", minimum=0, maximum=0.99
             ),
             a_2=bilby.core.prior.Uniform(
-                name="a_2", minimum=0, maximum=0.8, boundary="reflective"
+                name="a_2", minimum=0, maximum=0.99
             ),
-            tilt_1=bilby.core.prior.Sine(name="tilt_1", boundary="reflective"),
-            tilt_2=bilby.core.prior.Sine(name="tilt_2", boundary="reflective"),
+            tilt_1=bilby.core.prior.Sine(name="tilt_1"),
+            tilt_2=bilby.core.prior.Sine(name="tilt_2"),
             phi_12=bilby.core.prior.Uniform(
                 name="phi_12", minimum=0, maximum=2 * np.pi, boundary="periodic"
             ),
@@ -988,11 +990,11 @@ class TestPriorDict(unittest.TestCase):
                 unit="Mpc",
                 boundary=None,
             ),
-            dec=bilby.core.prior.Cosine(name="dec", boundary="reflective"),
+            dec=bilby.core.prior.Cosine(name="dec"),
             ra=bilby.core.prior.Uniform(
                 name="ra", minimum=0, maximum=2 * np.pi, boundary="periodic"
             ),
-            theta_jn=bilby.core.prior.Sine(name="theta_jn", boundary="reflective"),
+            theta_jn=bilby.core.prior.Sine(name="theta_jn"),
             psi=bilby.core.prior.Uniform(
                 name="psi", minimum=0, maximum=np.pi, boundary="periodic"
             ),
@@ -1054,21 +1056,23 @@ class TestPriorDict(unittest.TestCase):
         prior_set = bilby.core.prior.PriorDict(dictionary=self.default_prior_file)
         expected = bilby.core.prior.PriorDict(
             dict(
-                mass_1=bilby.core.prior.Uniform(
+                mass_1=bilby.core.prior.Constraint(
                     name="mass_1",
                     minimum=5,
                     maximum=100,
-                    unit="$M_{\\odot}$",
-                    boundary=None,
                 ),
-                mass_2=bilby.core.prior.Uniform(
+                mass_2=bilby.core.prior.Constraint(
                     name="mass_2",
                     minimum=5,
                     maximum=100,
-                    unit="$M_{\\odot}$",
-                    boundary=None,
                 ),
-                mass_ratio=bilby.core.prior.Constraint(
+                chirp_mass=bilby.core.prior.Uniform(
+                    name="chirp_mass",
+                    minimum=25,
+                    maximum=100,
+                    latex_label="$\mathcal{M}$",
+                ),
+                mass_ratio=bilby.core.prior.Uniform(
                     name="mass_ratio",
                     minimum=0.125,
                     maximum=1,
@@ -1076,13 +1080,13 @@ class TestPriorDict(unittest.TestCase):
                     unit=None,
                 ),
                 a_1=bilby.core.prior.Uniform(
-                    name="a_1", minimum=0, maximum=0.8, boundary="reflective"
+                    name="a_1", minimum=0, maximum=0.99,
                 ),
                 a_2=bilby.core.prior.Uniform(
-                    name="a_2", minimum=0, maximum=0.8, boundary="reflective"
+                    name="a_2", minimum=0, maximum=0.99,
                 ),
-                tilt_1=bilby.core.prior.Sine(name="tilt_1", boundary="reflective"),
-                tilt_2=bilby.core.prior.Sine(name="tilt_2", boundary="reflective"),
+                tilt_1=bilby.core.prior.Sine(name="tilt_1"),
+                tilt_2=bilby.core.prior.Sine(name="tilt_2"),
                 phi_12=bilby.core.prior.Uniform(
                     name="phi_12", minimum=0, maximum=2 * np.pi, boundary="periodic"
                 ),
@@ -1096,11 +1100,11 @@ class TestPriorDict(unittest.TestCase):
                     unit="Mpc",
                     boundary=None,
                 ),
-                dec=bilby.core.prior.Cosine(name="dec", boundary="reflective"),
+                dec=bilby.core.prior.Cosine(name="dec"),
                 ra=bilby.core.prior.Uniform(
                     name="ra", minimum=0, maximum=2 * np.pi, boundary="periodic"
                 ),
-                theta_jn=bilby.core.prior.Sine(name="theta_jn", boundary="reflective"),
+                theta_jn=bilby.core.prior.Sine(name="theta_jn"),
                 psi=bilby.core.prior.Uniform(
                     name="psi", minimum=0, maximum=np.pi, boundary="periodic"
                 ),
@@ -1248,7 +1252,7 @@ class TestFillPrior(unittest.TestCase):
         self.priors = bilby.core.prior.PriorDict(dictionary=self.priors)
         self.default_prior_file = os.path.join(
             os.path.dirname(os.path.realpath(__file__)),
-            "prior_files/binary_black_holes.prior",
+            "prior_files/precessing_spins_binary_black_holes.prior",
         )
         self.priors.fill_priors(self.likelihood, self.default_prior_file)
 
@@ -1288,7 +1292,7 @@ class TestCreateDefaultPrior(unittest.TestCase):
     def test_bbh_params(self):
         prior_file = os.path.join(
             os.path.dirname(os.path.realpath(__file__)),
-            "prior_files/binary_black_holes.prior",
+            "prior_files/precessing_spins_binary_black_holes.prior",
         )
         prior_set = bilby.core.prior.PriorDict(filename=prior_file)
         for prior in prior_set:
@@ -1302,7 +1306,7 @@ class TestCreateDefaultPrior(unittest.TestCase):
     def test_unknown_prior(self):
         prior_file = os.path.join(
             os.path.dirname(os.path.realpath(__file__)),
-            "prior_files/binary_black_holes.prior",
+            "prior_files/precessing_spins_binary_black_holes.prior",
         )
         self.assertIsNone(
             bilby.core.prior.create_default_prior(