some changes in test structure