All tests now pass.