Rewrote tests consistently.