Updated with test settings