simplify unit test targets