Get tests straightened out.