Updated Tests and finished lab 1 exercise 2 and 3