Added a makeTestUnit method