Tests pass with new code