Homework 7 : got some tests working