Use EXTRA instead of DEBUG for the expected ones ?