Updated with test