Tests should pass now.