test1/2 fixes