Major testing changes