tests straightened out