some changes in tests