multiple fixes in tests