tests fixes, due to recent changes that were made without

running the tests afterwards.