Tests pass now