Test fixes

Comment saying why we're waiting.