unit test clean-up - seperation