Updated with test confirmation