Tests should pass now