Tests should pass on 3.4 now