rewrote tests and all 7 passed