Remove unneeded sections from test helper