Added type annotations to hw2 and tests