Test-fixes