Get tests passing against v0.64