+some changes in tests