More test TODOs ported from Neocons