Changes for fixes in tests