Break out tests based on units