rewrote some tests