BHT and new fetch_stage compile :D on with the tests...