Rewrote tests