some changes in test2 mode