Tweaks in tests