Split out the unit tests