Fix isolation tests