Fixed second test and am happy with what is accomplished