All tests should now pass.