Remove from test helper