Fix with/without test when undefined