rewrote tests