Tests should now all pass.