further optimization of testing