Get tests passing on 2.7.