Some more test fixing