Simplify junit generation