revise testing structure a little