Finishing some the test 2 example