[#1251] Fixes to tests