Updated with test enabled