Tests pass now.