Adding final portion of tests