Finished Chp 8, but need to fix tests