Finished lab with new tests