Complete 7 chapter and add Test.java