Rewrote some tests