Fix some tests. Stillf ail.